diff options
Diffstat (limited to '.github/workflows')
-rw-r--r-- | .github/workflows/basic-eval.yml | 2 | ||||
-rw-r--r-- | .github/workflows/editorconfig.yml | 18 | ||||
-rw-r--r-- | .github/workflows/manual-nixos.yml | 2 | ||||
-rw-r--r-- | .github/workflows/manual-nixpkgs.yml | 2 | ||||
-rw-r--r-- | .github/workflows/nixos-manual.yml | 2 | ||||
-rw-r--r-- | .github/workflows/periodic-merge-24h.yml | 4 |
6 files changed, 15 insertions, 15 deletions
diff --git a/.github/workflows/basic-eval.yml b/.github/workflows/basic-eval.yml index c5e17faea86..67634af51f6 100644 --- a/.github/workflows/basic-eval.yml +++ b/.github/workflows/basic-eval.yml @@ -15,6 +15,6 @@ jobs: # we don't limit this action to only NixOS repo since the checks are cheap and useful developer feedback steps: - uses: actions/checkout@v2 - - uses: cachix/install-nix-action@v15 + - uses: cachix/install-nix-action@v16 # explicit list of supportedSystems is needed until aarch64-darwin becomes part of the trunk jobset - run: nix-build pkgs/top-level/release.nix -A tarball.nixpkgs-basic-release-checks --arg supportedSystems '[ "aarch64-darwin" "aarch64-linux" "x86_64-linux" "x86_64-darwin" ]' diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml index c0303ca80b9..445f0fcbaf8 100644 --- a/.github/workflows/editorconfig.yml +++ b/.github/workflows/editorconfig.yml @@ -11,36 +11,32 @@ on: jobs: tests: runs-on: ubuntu-latest - if: github.repository_owner == 'NixOS' + if: "github.repository_owner == 'NixOS' && !contains(github.event.pull_request.title, '[skip editorconfig]')" steps: - name: Get list of changed files from PR env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - echo 'PR_DIFF<<EOF' >> $GITHUB_ENV gh api \ repos/NixOS/nixpkgs/pulls/${{github.event.number}}/files --paginate \ | jq '.[] | select(.status != "removed") | .filename' \ - >> $GITHUB_ENV - echo 'EOF' >> $GITHUB_ENV + > "$HOME/changed_files" + - name: print list of changed files + run: | + cat "$HOME/changed_files" - uses: actions/checkout@v2 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - if: env.PR_DIFF - - uses: cachix/install-nix-action@v15 - if: env.PR_DIFF + - uses: cachix/install-nix-action@v16 with: # nixpkgs commit is pinned so that it doesn't break nix_path: nixpkgs=https://github.com/NixOS/nixpkgs/archive/f93ecc4f6bc60414d8b73dbdf615ceb6a2c604df.tar.gz - name: install editorconfig-checker run: nix-env -iA editorconfig-checker -f '<nixpkgs>' - if: env.PR_DIFF - name: Checking EditorConfig - if: env.PR_DIFF run: | - echo "$PR_DIFF" | xargs editorconfig-checker -disable-indent-size + cat "$HOME/changed_files" | xargs -r editorconfig-checker -disable-indent-size - if: ${{ failure() }} run: | echo "::error :: Hey! It looks like your changes don't follow our editorconfig settings. Read https://editorconfig.org/#download to configure your editor so you never see this error again." - diff --git a/.github/workflows/manual-nixos.yml b/.github/workflows/manual-nixos.yml index e134f263c88..b9181c5f3bb 100644 --- a/.github/workflows/manual-nixos.yml +++ b/.github/workflows/manual-nixos.yml @@ -18,7 +18,7 @@ jobs: with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@v15 + - uses: cachix/install-nix-action@v16 with: # explicitly enable sandbox extra_nix_config: sandbox = true diff --git a/.github/workflows/manual-nixpkgs.yml b/.github/workflows/manual-nixpkgs.yml index 6866bc3af61..3bdbd7f78fc 100644 --- a/.github/workflows/manual-nixpkgs.yml +++ b/.github/workflows/manual-nixpkgs.yml @@ -18,7 +18,7 @@ jobs: with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@v15 + - uses: cachix/install-nix-action@v16 with: # explicitly enable sandbox extra_nix_config: sandbox = true diff --git a/.github/workflows/nixos-manual.yml b/.github/workflows/nixos-manual.yml index eade07427d3..e1c5b4dc93b 100644 --- a/.github/workflows/nixos-manual.yml +++ b/.github/workflows/nixos-manual.yml @@ -19,7 +19,7 @@ jobs: with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@v15 + - uses: cachix/install-nix-action@v16 - name: Check DocBook files generated from Markdown are consistent run: | nixos/doc/manual/md-to-db.sh diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml index 9032b3d7d91..b8535fdf952 100644 --- a/.github/workflows/periodic-merge-24h.yml +++ b/.github/workflows/periodic-merge-24h.yml @@ -32,6 +32,10 @@ jobs: into: staging-next-21.05 - from: staging-next-21.05 into: staging-21.05 + - from: release-21.11 + into: staging-next-21.11 + - from: staging-next-21.11 + into: staging-21.11 name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} steps: - uses: actions/checkout@v2 |