Skip to content

Commit cea7834

Browse files
committed
contrib: switch to our Guix container instead of the bundled one
1 parent 0155144 commit cea7834

File tree

1 file changed

+13
-14
lines changed

1 file changed

+13
-14
lines changed

.github/workflows/guix-build.yml

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Hash Dockerfile
2121
id: dockerfile
2222
run: |
23-
echo "::set-output name=hash::$(sha256sum ./contrib/guix/Dockerfile | cut -d ' ' -f1)"
23+
echo "::set-output name=hash::$(sha256sum ./contrib/containers/guix/Dockerfile | cut -d ' ' -f1)"
2424
2525
- name: Cache Docker layers
2626
uses: actions/cache@v2
@@ -33,25 +33,24 @@ jobs:
3333
- name: Build Docker image
3434
uses: docker/build-push-action@v2
3535
with:
36-
context: .
37-
file: ./contrib/guix/Dockerfile
36+
context: ${{ github.workspace }}
37+
build-contexts: |
38+
docker_root=${{ github.workspace }}/contrib/containers/guix
39+
file: ./contrib/containers/guix/Dockerfile
3840
load: true
39-
tags: alpine-guix:latest
41+
tags: guix_ubuntu:latest
4042
cache-from: type=local,src=/tmp/.buildx-cache
4143
cache-to: type=local,dest=/tmp/.buildx-cache
4244

4345
- name: Run Guix build
4446
run: |
45-
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"
47+
docker run --privileged -d --rm \
48+
--name guix-daemon \
49+
-e ADDITIONAL_GUIX_COMMON_FLAGS='--max-jobs=32'
50+
-v ${{ github.workspace }}:/src/dash \
51+
-w /src/dash \
52+
guix_ubuntu:latest && \
53+
docker exec guix-daemon bash -c "/usr/local/bin/guix-start"
5554
5655
- name: Ensure build passes
5756
run: |

0 commit comments

Comments
 (0)