diff --git a/.github/workflows/nix-build.yaml b/.github/workflows/nix-build.yaml index 825feda5..6e7b2b7c 100644 --- a/.github/workflows/nix-build.yaml +++ b/.github/workflows/nix-build.yaml @@ -23,6 +23,7 @@ jobs: install_url: https://nixos.org/nix/install extra_nix_config: | auto-optimise-store = true + access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} experimental-features = nix-command flakes - uses: cachix/cachix-action@v12 with: diff --git a/.github/workflows/nix-meson-ver-update.yaml b/.github/workflows/nix-meson-ver-update.yaml deleted file mode 100644 index ddeac945..00000000 --- a/.github/workflows/nix-meson-ver-update.yaml +++ /dev/null @@ -1,26 +0,0 @@ -name: "Nix & Meson: update version" - -on: [workflow_dispatch] - -jobs: - update: - runs-on: ubuntu-latest - steps: - - name: Clone repository - uses: actions/checkout@v3 - - name: Update flake and meson version - run: | - REGEX="([0-9]+(\.[0-9a-zA-Z]+)+)" - - CRT_REV=$(git show-ref --tags --head --abbrev | head -n 1 | head -c 7) - TAG_REV=$(git show-ref --tags --abbrev | tail -n 1 | head -c 7) - CRT_VER=$(sed -nEe "/$REGEX/{p;q;}" meson.build | awk -F\' '{print $2}') - VERSION=$(git show-ref --tags --abbrev | tail -n 1 | tail -c +20) - - if [[ $TAG_REV = $CRT_REV ]] || [[ $CRT_VER != $VERSION ]]; then - sed -Ei "s/$REGEX/$VERSION/g" meson.build - sed -Ei "s/$REGEX/$VERSION/g" flake.nix - fi - - uses: stefanzweifel/git-auto-commit-action@v4 - with: - commit_message: "[gha] bump flake and meson version" diff --git a/.github/workflows/nix-update.yaml b/.github/workflows/nix-update.yaml index 5555382b..5d28532b 100644 --- a/.github/workflows/nix-update.yaml +++ b/.github/workflows/nix-update.yaml @@ -14,6 +14,7 @@ jobs: install_url: https://nixos.org/nix/install extra_nix_config: | auto-optimise-store = true + access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} experimental-features = nix-command flakes - name: Update lockfile run: nix/update-inputs.sh