diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d013d7f..b3b8664 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2023-11-02T20:27:13Z by kres 70e6597-dirty. +# Generated on 2023-12-01T10:29:33Z by kres latest. name: default concurrency: @@ -22,6 +22,7 @@ jobs: permissions: actions: read contents: write + issues: read packages: write pull-requests: read runs-on: @@ -29,10 +30,10 @@ jobs: - pkgs if: (!startsWith(github.head_ref, 'renovate/') && !startsWith(github.head_ref, 'dependabot/')) outputs: - labels: ${{ steps.workflow-run-info.outputs.pullRequestLabels }} + labels: ${{ steps.retrieve-pr-labels.outputs.result }} services: buildkitd: - image: moby/buildkit:v0.12.2 + image: moby/buildkit:v0.12.3 options: --privileged ports: - 1234:1234 @@ -67,11 +68,20 @@ jobs: if: github.event_name != 'pull_request' run: | make PUSH=true - - name: Retrieve workflow info - id: workflow-run-info - uses: potiuk/get-workflow-origin@v1_5 + - name: Retrieve PR labels + id: retrieve-pr-labels + if: github.event_name == 'pull_request' && always() + uses: actions/github-script@v6 with: - token: ${{ secrets.GITHUB_TOKEN }} + retries: "3" + script: | + const resp = await github.rest.issues.get({ + issue_number: context.issue.number, + owner: context.repo.owner, + repo: context.repo.repo, + }) + + return resp.data.labels.map(label => label.name) - name: release-notes if: startsWith(github.ref, 'refs/tags/') run: | @@ -86,12 +96,12 @@ jobs: runs-on: - self-hosted - pkgs - if: contains(needs.default.outputs.labels, 'integration/reproducibility') + if: contains(fromJSON(needs.default.outputs.labels), 'integration/reproducibility') needs: - default services: buildkitd: - image: moby/buildkit:v0.12.2 + image: moby/buildkit:v0.12.3 options: --privileged ports: - 1234:1234 diff --git a/.github/workflows/slack-notify.yaml b/.github/workflows/slack-notify.yaml index 493e0eb..d635cb6 100644 --- a/.github/workflows/slack-notify.yaml +++ b/.github/workflows/slack-notify.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2023-11-02T20:27:13Z by kres 70e6597-dirty. +# Generated on 2023-12-01T10:29:33Z by kres latest. name: slack-notify "on": @@ -15,14 +15,15 @@ jobs: runs-on: - self-hosted - generic - if: ${{ github.event.workflow_run.conclusion != 'skipped' }} + if: github.event.workflow_run.conclusion != 'skipped' steps: - - name: Retrieve Workflow Run Info - id: retrieve-workflow-run-info - uses: potiuk/get-workflow-origin@v1_5 - with: - sourceRunId: ${{ github.event.workflow_run.id }} - token: ${{ secrets.GITHUB_TOKEN }} + - name: Get PR number + id: get-pr-number + if: github.event.workflow_run.event == 'pull_request' + env: + GH_TOKEN: ${{ github.token }} + run: | + echo pull_request_number=$(gh pr view -R ${{ github.repository }} ${{ github.event.workflow_run.head_repository.owner.login }}:${{ github.event.workflow_run.head_branch }} --json number --jq .number) >> $GITHUB_OUTPUT - name: Slack Notify uses: slackapi/slack-github-action@v1 with: @@ -39,7 +40,7 @@ jobs: "fields": [ { "type": "mrkdwn", - "text": "${{ github.event.workflow_run.event == 'pull_request' && format('*Pull Request:* {0} (`{1}`)\n<{2}/pull/{3}|{4}>', github.repository, github.ref_name, github.event.repository.html_url, steps.retrieve-workflow-run-info.outputs.pullRequestNumber, github.event.workflow_run.display_title) || format('*Build:* {0} (`{1}`)\n<{2}/commit/{3}|{4}>', github.repository, github.ref_name, github.event.repository.html_url, github.sha, github.event.workflow_run.display_title) }}" + "text": "${{ github.event.workflow_run.event == 'pull_request' && format('*Pull Request:* {0} (`{1}`)\n<{2}/pull/{3}|{4}>', github.repository, github.ref_name, github.event.repository.html_url, steps.get-pr-number.outputs.pull_request_number, github.event.workflow_run.display_title) || format('*Build:* {0} (`{1}`)\n<{2}/commit/{3}|{4}>', github.repository, github.ref_name, github.event.repository.html_url, github.sha, github.event.workflow_run.display_title) }}" }, { "type": "mrkdwn", diff --git a/.github/workflows/weekly.yaml b/.github/workflows/weekly.yaml index 9ec8fd2..9a375ab 100644 --- a/.github/workflows/weekly.yaml +++ b/.github/workflows/weekly.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2023-11-02T20:27:13Z by kres 70e6597-dirty. +# Generated on 2023-12-01T10:29:33Z by kres latest. name: weekly concurrency: @@ -16,7 +16,7 @@ jobs: - pkgs services: buildkitd: - image: moby/buildkit:v0.12.2 + image: moby/buildkit:v0.12.3 options: --privileged ports: - 1234:1234 diff --git a/Pkgfile b/Pkgfile index 0302827..7de633f 100644 --- a/Pkgfile +++ b/Pkgfile @@ -4,12 +4,12 @@ format: v1alpha2 vars: PKGS_PREFIX: ghcr.io/siderolabs - PKGS_VERSION: v1.6.0-alpha.0-28-g0bb2a79 + PKGS_VERSION: v1.6.0 # renovate: datasource=git-refs versioning=git depName=https://github.com/awslabs/tc-redirect-tap.git - tc_redirect_tap_ref: 706117b1e02a532f7dadab3d9704f34521a0eac9 - tc_redirect_tap_sha256: c239bc45340e778b61be29d6069236f2c6ec149c6a7b4cd21118c8297b072d80 - tc_redirect_tap_sha512: a7f068242d00402a109a985e809a604284bf5c47f16f19527aafbb3d39134d65b3c97ae3c4a18807ac1ac5c1a95189eb517fd78418fe5b303d195a7d713bb2b8 + tc_redirect_tap_ref: 6827f7b2f5e9ec675cb7dc9bbe4b201c228d565e + tc_redirect_tap_sha256: ec9c09e2d2d1aa0d616c03c205ac4b870b32a5693253700b949e32c7e69e4a56 + tc_redirect_tap_sha512: 3f37f84f8d17626fa24b635d53cad5da8966de80a6c4d38977ac9c6bae79dbe73cc59123c06b46fef7ea18bb74ff5d0136ff7e4266ce622676157676376d5857 labels: org.opencontainers.image.source: https://github.com/siderolabs/extras