From 1b45d9e15b2c33a8be55a7b724b1e8bee144eb05 Mon Sep 17 00:00:00 2001
From: Christian Paul <christianp@matrix.org>
Date: Fri, 12 Aug 2022 01:35:37 +0200
Subject: [PATCH] Remove workaround for issue 803 (#830)
---
.github/workflows/tests.yml | 4 ----
Dockerfile | 3 ---
changelog.d/830.misc | 1 +
3 files changed, 1 insertion(+), 7 deletions(-)
create mode 100644 changelog.d/830.misc
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 825fecc..3e2a996 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -11,8 +11,6 @@ jobs:
uses: actions/setup-node@v1
with:
node-version: 16
- # Workaround for https://github.com/matrix-org/matrix-appservice-discord/issues/803
- - run: git config --global url.https://github.com/.insteadOf git://github.com/
- run: yarn
- run: yarn lint
test:
@@ -26,7 +24,5 @@ jobs:
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node_version }}
- # Workaround for https://github.com/matrix-org/matrix-appservice-discord/issues/803
- - run: git config --global url.https://github.com/.insteadOf git://github.com/
- run: yarn
- run: yarn test
diff --git a/Dockerfile b/Dockerfile
index b3b3cf0..8d66fef 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,9 +3,6 @@ COPY . /tmp/src
# install some dependencies needed for the build process
RUN apt update && apt install -y build-essential make gcc g++ python3 ca-certificates libc-dev wget git
-# Workaround for https://github.com/matrix-org/matrix-appservice-discord/issues/803
-RUN git config --global url.https://github.com/.insteadOf git://github.com/
-
RUN cd /tmp/src \
&& yarn
diff --git a/changelog.d/830.misc b/changelog.d/830.misc
new file mode 100644
index 0000000..1e266b8
--- /dev/null
+++ b/changelog.d/830.misc
@@ -0,0 +1 @@
+Remove `git config` workaround to pull a dependency from github.com.
\ No newline at end of file
--
GitLab