Skip to content

Commit 15b4259

Browse files
committed
contrib: switch to our Guix container instead of the bundled one
1 parent 1342dac commit 15b4259

File tree

1 file changed

+4
-11
lines changed

1 file changed

+4
-11
lines changed

.github/workflows/guix-build.yml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,24 +34,17 @@ jobs:
3434
uses: docker/build-push-action@v2
3535
with:
3636
context: .
37-
file: ./contrib/guix/Dockerfile
37+
file: ./contrib/containers/guix/Dockerfile
3838
load: true
39-
tags: alpine-guix:latest
39+
tags: guix_ubuntu:latest
4040
cache-from: type=local,src=/tmp/.buildx-cache
4141
cache-to: type=local,dest=/tmp/.buildx-cache
4242

4343
- name: Run Guix build
4444
run: |
4545
export ADDITIONAL_GUIX_COMMON_FLAGS='--max-jobs=32' && \
46-
mkdir -p depends/SDKs && \
47-
mkdir -p /tmp/guix-store && \
48-
curl -L https://bitcoincore.org/depends-sources/sdks/Xcode-12.1-12A7403-extracted-SDK-with-libcxx-headers.tar.gz | tar -xz -C depends/SDKs && \
49-
docker run --privileged -d --name guix-daemon --rm -v ${{ github.workspace }}:/dash -w /dash alpine-guix:latest && \
50-
docker exec guix-daemon bash -c "\
51-
chmod 777 /dash/depends && \
52-
git config --global --add safe.directory /dash && \
53-
cd /dash && \
54-
contrib/guix/guix-build"
46+
docker run -d --rm guix_ubuntu:latest && \
47+
docker exec guix_ubuntu bash -c "guix-start"
5548
5649
- name: Ensure build passes
5750
run: |

0 commit comments

Comments
 (0)