From 84f51065efe4dbe32c93dc4cd2f05c6abeedfa9c Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Fri, 14 Jul 2023 22:09:39 +0800 Subject: [PATCH] ci: update environment and fix format errors --- .github/workflows/build.yml | 4 ++-- .github/workflows/iso.yml | 2 +- .github/workflows/site.yml | 3 +-- .github/workflows/update.yml | 7 ++++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ca03f3d6..e82e39d7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,8 +4,6 @@ on: branches: - master - develop -env: - NIXPKGS_ALLOW_UNFREE: "1" jobs: build-custom-packages: runs-on: ubuntu-latest @@ -21,3 +19,5 @@ jobs: authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - name: Build custom packages run: nix build -f ./pkgs --impure + env: + NIXPKGS_ALLOW_UNFREE: "1" diff --git a/.github/workflows/iso.yml b/.github/workflows/iso.yml index 30ccbbf5..5d786cf7 100644 --- a/.github/workflows/iso.yml +++ b/.github/workflows/iso.yml @@ -21,4 +21,4 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - gh release create "${{ github.ref }}" --generate-notes build-iso-result/iso/*.iso + gh release create latest --prerelease --generate-notes build-iso-result/iso/*.iso diff --git a/.github/workflows/site.yml b/.github/workflows/site.yml index 2b962e20..789b83be 100644 --- a/.github/workflows/site.yml +++ b/.github/workflows/site.yml @@ -1,10 +1,9 @@ name: "Build project site" on: + workflow_dispatch: push: branches: - master - paths: - - docs/ jobs: build: runs-on: ubuntu-latest diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 0e326691..517bc14f 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -11,16 +11,17 @@ jobs: - uses: DeterminateSystems/magic-nix-cache-action@v2 - uses: DeterminateSystems/nix-installer-action@v4 - name: Update flake inputs - run: nix flake update --commit-lock-file --commit-lockfile-summary "flake.lock: update inputs" + run: | + nix flake update --commit-lock-file --commit-lockfile-summary "flake.lock: update inputs" env: GIT_AUTHOR_NAME: github-actions[bot] GIT_AUTHOR_EMAIL: github-actions[bot]@users.noreply.github.com GIT_COMMITTER_NAME: github-actions[bot] GIT_COMMITTER_EMAIL: github-actions[bot]@users.noreply.github.com - name: Build custom packages - run: nix build --impure --file ./pkgs + run: nix build --dry-run --impure --file ./pkgs - name: Build NixOS configurations - run: nix build --impure .#images.{ni,plover,bootstrap} + run: nix build --dry-run --impure .#images.{ni,plover,bootstrap} - name: Push changes to remote run: | git remote remove origin