From fa374ac816de2b61091d9782b78c67e90a51861c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillem=20C=C3=B3rdoba?= Date: Wed, 10 Jul 2024 16:38:13 +0200 Subject: [PATCH] Workflows fixes --- .github/workflows/test-app.yaml | 2 +- .github/workflows/test-zome.yaml | 2 +- .../app/web-app/.github/workflows/test.yaml.hbs | 4 ++-- .../.github/workflows/build-and-cache.yaml.hbs | 12 ++++++------ .../zome/web-app/.github/workflows/test.yaml.hbs | 4 ++-- .../.github/workflows/update-flake-inputs.yaml.hbs | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/test-app.yaml b/.github/workflows/test-app.yaml index 6f9bab9..7d28717 100644 --- a/.github/workflows/test-app.yaml +++ b/.github/workflows/test-app.yaml @@ -28,5 +28,5 @@ jobs: - name: Test app template run: | - nix develop --command bash -c "sh run_test_app.sh" + nix develop --accept-flake-config --command bash -c "sh run_test_app.sh" diff --git a/.github/workflows/test-zome.yaml b/.github/workflows/test-zome.yaml index b918c20..1d4bdf3 100644 --- a/.github/workflows/test-zome.yaml +++ b/.github/workflows/test-zome.yaml @@ -28,5 +28,5 @@ jobs: - name: Test zome template run: | - nix develop --command bash -c "sh run_test_zome.sh" + nix develop --accept-flake-config --command bash -c "sh run_test_zome.sh" diff --git a/templates/app/web-app/.github/workflows/test.yaml.hbs b/templates/app/web-app/.github/workflows/test.yaml.hbs index 50d35de..e7bccb3 100644 --- a/templates/app/web-app/.github/workflows/test.yaml.hbs +++ b/templates/app/web-app/.github/workflows/test.yaml.hbs @@ -8,7 +8,7 @@ on: branches: [ main, develop ] jobs: - testbuild: + test-and-build: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -28,4 +28,4 @@ jobs: - name: Install and test run: | - nix develop --command bash -c "pnpm i && pnpm t && pnpm package" + nix develop --accept-flake-config --command bash -c "pnpm i && pnpm t && pnpm package" diff --git a/templates/zome/web-app/.github/workflows/build-and-cache.yaml.hbs b/templates/zome/web-app/.github/workflows/build-and-cache.yaml.hbs index 6f3bfb5..1bde0cc 100644 --- a/templates/zome/web-app/.github/workflows/build-and-cache.yaml.hbs +++ b/templates/zome/web-app/.github/workflows/build-and-cache.yaml.hbs @@ -4,7 +4,7 @@ on: branches: [ main ] jobs: - testbuild: + build-and-cache-nix-packages: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -24,24 +24,24 @@ jobs: - name: Install and test run: | - nix develop --command bash -c "pnpm i && pnpm t && pnpm -F @holochain-open-dev/{{kebab_case app_name}} build" + nix develop --accept-flake-config --command bash -c "pnpm i && pnpm t && pnpm -F @holochain-open-dev/{{kebab_case app_name}} build" - name: Build zomes env: CACHIX_AUTH_TOKEN: "$\{{ secrets.CACHIX_TOKEN_HOLOCHAIN_OPEN_DEV }}" run: | - nix build -L .#{{snake_case app_name}}_integrity + nix build --accept-flake-config -L .#{{snake_case app_name}}_integrity cachix push holochain-open-dev $(nix path-info --accept-flake-config .#{{snake_case app_name}}_integrity) cachix pin holochain-open-dev {{snake_case app_name}}_integrity_debug $(nix path-info --accept-flake-config .#{{snake_case app_name}}_integrity) - nix build -L .#{{snake_case app_name}}_integrity.meta.release + nix build --accept-flake-config -L .#{{snake_case app_name}}_integrity.meta.release cachix push holochain-open-dev $(nix path-info --accept-flake-config .#{{snake_case app_name}}_integrity) cachix pin holochain-open-dev {{snake_case app_name}}_integrity $(nix path-info --accept-flake-config .#{{snake_case app_name}}_integrity.meta.release) - nix build -L .#{{snake_case app_name}} + nix build --accept-flake-config -L .#{{snake_case app_name}} cachix push holochain-open-dev $(nix path-info --accept-flake-config .#{{snake_case app_name}}) cachix pin holochain-open-dev {{snake_case app_name}}_debug $(nix path-info --accept-flake-config .#{{snake_case app_name}}) - nix build -L .#{{snake_case app_name}}.meta.release + nix build --accept-flake-config -L .#{{snake_case app_name}}.meta.release cachix push holochain-open-dev $(nix path-info --accept-flake-config .#{{snake_case app_name}}.meta.release) cachix pin holochain-open-dev {{snake_case app_name}} $(nix path-info --accept-flake-config .#{{snake_case app_name}}.meta.release) diff --git a/templates/zome/web-app/.github/workflows/test.yaml.hbs b/templates/zome/web-app/.github/workflows/test.yaml.hbs index 3d337e6..337842b 100644 --- a/templates/zome/web-app/.github/workflows/test.yaml.hbs +++ b/templates/zome/web-app/.github/workflows/test.yaml.hbs @@ -8,7 +8,7 @@ on: branches: [ main, develop ] jobs: - testbuild: + test-and-build: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -28,4 +28,4 @@ jobs: - name: Install and test run: | - nix develop --command bash -c "pnpm i && pnpm t && pnpm -F @holochain-open-dev/{{kebab_case app_name}} build" + nix develop --accept-flake-config --command bash -c "pnpm i && pnpm t && pnpm -F @holochain-open-dev/{{kebab_case app_name}} build" diff --git a/templates/zome/web-app/.github/workflows/update-flake-inputs.yaml.hbs b/templates/zome/web-app/.github/workflows/update-flake-inputs.yaml.hbs index cccbc37..3c0784b 100644 --- a/templates/zome/web-app/.github/workflows/update-flake-inputs.yaml.hbs +++ b/templates/zome/web-app/.github/workflows/update-flake-inputs.yaml.hbs @@ -29,7 +29,7 @@ jobs: - name: Update Flake run: | nix flake update - nix develop + nix develop --accept-flake-config - uses: dorny/paths-filter@v3 id: changes