Skip to content
This repository was archived by the owner on May 4, 2022. It is now read-only.

Commit e1e8094

Browse files
authored
Merge pull request #165 from replit/cb-fix-ci
Fix CI Errors
2 parents 9bfb4fd + 8e79388 commit e1e8094

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

.circleci/config.yml

+6-3
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,26 @@ jobs:
55
- image: docker:18.09
66
steps:
77
- checkout
8-
- setup_remote_docker
8+
- setup_remote_docker:
9+
version: 18.09.3
910
- run: apk add --no-cache --no-progress make git
1011
- run: make test
1112
build_and_test_changed:
1213
docker:
1314
- image: docker:18.09
1415
steps:
1516
- checkout
16-
- setup_remote_docker
17+
- setup_remote_docker:
18+
version: 18.09.3
1719
- run: apk add --no-cache --no-progress make git
1820
- run: make changed-test
1921
build_test_and_deploy:
2022
docker:
2123
- image: docker:18.09
2224
steps:
2325
- checkout
24-
- setup_remote_docker
26+
- setup_remote_docker:
27+
version: 18.09.3
2528
- run: apk add --no-cache --no-progress make git
2629
- run: make test
2730
- deploy:

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ COPY --from=0 /out/polygott-x11-vnc /usr/bin/polygott-x11-vnc
4444
ENV LC_ALL=en_US.UTF-8
4545
ENV LANG=en_US.UTF-8
4646
ENV VIRTUAL_ENV="/opt/virtualenvs/python3"
47-
ENV PATH="${VIRTUAL_ENV}/bin:/usr/GNUstep/System/Tools:/usr/GNUstep/Local/Tools:${PATH}"
47+
ENV PATH="/usr/local/go/bin:${VIRTUAL_ENV}/bin:/usr/GNUstep/System/Tools:/usr/GNUstep/Local/Tools:${PATH}"
4848
ENV PYTHONPATH="${VIRTUAL_ENV}/lib/python3.8/site-packages"
4949
ENV USER=runner
5050

languages/go.toml

+2-5
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,13 @@ entrypoint = "main.go"
66
extensions = [
77
"go"
88
]
9-
aptRepos = [
10-
"ppa:longsleep/golang-backports"
11-
]
129

1310
packages = [
14-
"golang-1.14-go",
1511
"pkg-config"
1612
]
1713
setup = [
18-
"go get -u github.com/saibing/bingo"
14+
"cd /tmp && wget -q https://golang.org/dl/go1.14.7.linux-amd64.tar.gz && tar -C /usr/local -xzf go1.14.7.linux-amd64.tar.gz && rm go1.14.7.linux-amd64.tar.gz",
15+
"/usr/local/go/bin/go get -u github.com/saibing/bingo"
1916
]
2017

2118
[compile]

0 commit comments

Comments
 (0)