diff --git a/.github/workflows/update-nixpkgs-cleanup.yaml b/.github/workflows/update-nixpkgs-cleanup.yaml index b0bf4ca3a..dbc601415 100644 --- a/.github/workflows/update-nixpkgs-cleanup.yaml +++ b/.github/workflows/update-nixpkgs-cleanup.yaml @@ -1,7 +1,7 @@ name: update-nixpkgs-cleanup on: - pull_request: + pull_request_target: types: - closed @@ -12,7 +12,12 @@ jobs: steps: - uses: actions/checkout@v4 with: - repository: flyingcircusio/fc-nixos-release-tools + ref: ${{ github.event.pull_request.head.sha }} + path: 'fc-nixos' + fetch-depth: 0 + - uses: actions/checkout@v4 + with: + repository: flyingcircusio/fc-nixos-release-tools-testing path: 'release-tools' - uses: cachix/install-nix-action@v21 with: @@ -40,7 +45,9 @@ jobs: - run: | ./result/bin/update-nixpkgs cleanup \ --merged-pr-id ${{ github.event.number }} \ + --fc-nixos-dir fc-nixos \ --nixpkgs-dir nixpkgs \ - --nixpkgs-origin-url https://x-access-token:${{steps.app-token.outputs.token}}@github.com/flyingcircusio/nixpkgs.git + --nixpkgs-origin-url https://x-access-token:${{steps.app-token.outputs.token}}@github.com/flyingcircusio/nixpkgs-testing.git env: GH_TOKEN: ${{ steps.app-token.outputs.token }} + MATRIX_HOOKSHOT_URL: ${{ secrets.MATRIX_HOOKSHOT_URL }} diff --git a/release/versions.json b/release/versions.json index 21dee7c30..5c3b2a30c 100644 --- a/release/versions.json +++ b/release/versions.json @@ -11,6 +11,6 @@ "hash": "sha256-gKEi/inkCJcoOjt6W2lCb1sNwANe38H2sPJakIRObQg=", "owner": "flyingcircusio", "repo": "nixpkgs", - "rev": "ff898be476375d3673334608f5a41efd9805258a" + "rev": "299a15d5983e06b1142fb69e8762c07c7336496f" } }