From 384072c4b0c1c6e7d516626825ce291ba84b202f Mon Sep 17 00:00:00 2001 From: Marc Scholten Date: Thu, 13 Jul 2023 20:31:02 +0200 Subject: [PATCH] use nix develop to fix builds --- .github/workflows/docs.yml | 7 ++----- .github/workflows/ihp-new.yml | 5 +---- .github/workflows/pr_compile_check.yml | 5 +---- .github/workflows/tests.yml | 5 +---- 4 files changed, 5 insertions(+), 17 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index dcdbd2b5d..807bc3e07 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -18,9 +18,6 @@ jobs: name: digitallyinduced signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}' authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - - name: Install devenv.sh - run: nix profile install --accept-flake-config github:cachix/devenv/latest - if: matrix.os != 'ARM64' - name: Configure AWS credentials uses: aws-actions/configure-aws-credentials@v1 with: @@ -30,11 +27,11 @@ jobs: - name: Build Docs run: | cd $GITHUB_WORKSPACE - devenv shell build-guide + nix develop --impure --command build-guide - name: Build API Reference run: | cd $GITHUB_WORKSPACE - devenv shell build-api-reference + nix develop --impure --command build-api-reference tar -czvf api-reference.tar.gz haddock-build - name: Uploading to S3 run: | diff --git a/.github/workflows/ihp-new.yml b/.github/workflows/ihp-new.yml index f5a39df80..93afbf864 100644 --- a/.github/workflows/ihp-new.yml +++ b/.github/workflows/ihp-new.yml @@ -18,9 +18,6 @@ jobs: name: digitallyinduced signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}' authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - - name: Install devenv.sh - run: nix profile install --accept-flake-config github:cachix/devenv/latest - if: matrix.os != 'ARM64' - name: Configure AWS credentials uses: aws-actions/configure-aws-credentials@v1 with: @@ -30,6 +27,6 @@ jobs: - name: Build ihp-new Package run: | cd $GITHUB_WORKSPACE - devenv shell build-ihp-new + nix develop --impure --command build-ihp-new - name: Uploading ihp-new Package run: aws s3 cp ./ProjectGenerator/tarball.tar.gz s3://${{ secrets.S3_BUCKET }}/ihp-new.tar.gz diff --git a/.github/workflows/pr_compile_check.yml b/.github/workflows/pr_compile_check.yml index 3ff1df6de..d7532dbc0 100644 --- a/.github/workflows/pr_compile_check.yml +++ b/.github/workflows/pr_compile_check.yml @@ -14,11 +14,8 @@ jobs: with: name: digitallyinduced skipPush: true - - name: Install devenv.sh - run: nix profile install --accept-flake-config github:cachix/devenv/latest - if: matrix.os != 'ARM64' - run: | cd $GITHUB_WORKSPACE mkdir -p ~/.config/nixpkgs echo "{ allowBroken = true; }" >> ~/.config/nixpkgs/config.nix - devenv shell fastbuild + nix develop --impure --command fastbuild diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 089c9fcdc..f1997af30 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -18,7 +18,4 @@ jobs: name: digitallyinduced signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}' authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - - name: Install devenv - run: nix profile install --accept-flake-config github:cachix/devenv/latest - if: matrix.os != 'ARM64' - - run: devenv shell tests + - run: nix develop --impure --command tests