diff --git a/.github/ISSUE_TEMPLATE/release-checklist.md b/.github/ISSUE_TEMPLATE/release-checklist.md index a9ba0efb6..47b211506 100644 --- a/.github/ISSUE_TEMPLATE/release-checklist.md +++ b/.github/ISSUE_TEMPLATE/release-checklist.md @@ -52,7 +52,7 @@ Fedora packaging: GitHub release: - [ ] Wait until the Bodhi update shows "Signed :heavy_check_mark:" in the Metadata box. - [ ] Verify that the signing script can fetch the release binaries by running `./signing-ticket.sh test `, where `r` is the Release of the Fedora package without the dist tag (probably `1`) - - [ ] Run `./signing-ticket.sh ticket ` and paste the output into a [releng ticket](forge.fedoraproject.org/releng/tickets/issues/new). + - [ ] Run `./signing-ticket.sh ticket ` and paste the output into a [releng ticket](https://forge.fedoraproject.org/releng/tickets/issues/new). - [ ] Wait for the ticket to be closed - [ ] Download the artifacts and signatures - [ ] Verify the signatures diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 168a83ea4..e13e614fa 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -24,7 +24,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Set up Go 1.x - uses: actions/setup-go@v6 + uses: actions/setup-go@v5 with: go-version: ${{ matrix.go-version }} - name: Check out repository @@ -52,7 +52,7 @@ jobs: fi echo "All Go files are correctly formatted." - name: Run linter - uses: golangci/golangci-lint-action@v9 + uses: golangci/golangci-lint-action@v8 with: version: v2.6.2 regenerate: @@ -62,7 +62,7 @@ jobs: - name: Check out repository uses: actions/checkout@v6 - name: Set up Go 1.x - uses: actions/setup-go@v6 + uses: actions/setup-go@v5 with: go-version: 1.25.x - name: Install schematyper diff --git a/.github/workflows/ignition-validate.yml b/.github/workflows/ignition-validate.yml index 6cc29b5b5..0e18d7b54 100644 --- a/.github/workflows/ignition-validate.yml +++ b/.github/workflows/ignition-validate.yml @@ -25,7 +25,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Set up Go 1.x - uses: actions/setup-go@v6 + uses: actions/setup-go@v5 with: go-version: ${{ matrix.go-version }} - name: Check out repository diff --git a/signing-ticket.sh b/signing-ticket.sh index 637f0a71e..313fee040 100755 --- a/signing-ticket.sh +++ b/signing-ticket.sh @@ -33,7 +33,7 @@ do_sign() { # Grab the binaries out of the redistributable rpm rpm="ignition-validate-redistributable-${VR}.noarch.rpm" koji download-build --key $RPMKEY --rpm $rpm -rpm -qip $rpm | grep -P "^Signature.*${RPMKEY}$" # Verify the output has the key in it +rpm -Kv "$rpm" 2>&1 | grep -qi "${RPMKEY}" # Verify the output has the key in it rpm2cpio $rpm | cpio -idv './usr/share/ignition/ignition-validate-*' # Rename the binaries