diff --git a/.github/workflows/jenkins-x-pr.yaml b/.github/workflows/jenkins-x-pr.yaml deleted file mode 100644 index 88f05fd558..0000000000 --- a/.github/workflows/jenkins-x-pr.yaml +++ /dev/null @@ -1,20 +0,0 @@ -permissions: - contents: read # to fetch code (actions/checkout) - -jobs: - pr: - if: github.repository_owner == 'jenkins-x' - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: build-make-test - uses: docker://golang:1.19.2@sha256:0467d7d12d170ed8d998a2dae4a09aa13d0aa56e6d23c4ec2b1e4faacf86a813 - with: - args: -c "make test linux" - entrypoint: /bin/sh -"on": - push: - branches-ignore: - - main - - master diff --git a/.github/workflows/jenkins-x-release.yaml b/.github/workflows/jenkins-x-release.yaml index c41c4b02c1..c54c1c9f21 100644 --- a/.github/workflows/jenkins-x-release.yaml +++ b/.github/workflows/jenkins-x-release.yaml @@ -111,6 +111,15 @@ jobs: DOCKER_REGISTRY_ORG: jenkins-x REPO_NAME: ${{ github.event.repository.name }} VERSION: ${{ steps.prep.outputs.version }} + - uses: imjasonh/setup-crane@v0.1 + - name: get image digest + env: + VERSION: ${{ steps.prep.outputs.version }} + run: | + DIGEST_SHA_JX_BOOT=$(crane digest ghcr.io/jenkins-x/jx-boot:$VERSION) + DIGEST_SHA_JX=$(crane digest ghcr.io/jenkins-x/jx:$VERSION) + echo "DIGEST_SHA_JX_BOOT=${DIGEST_SHA_JX_BOOT}" >> $GITHUB_ENV + echo "DIGEST_SHA_JX=${DIGEST_SHA_JX}" >> $GITHUB_ENV - name: cosign-installer uses: sigstore/cosign-installer@v2.8.1 - name: Sign the published Docker image @@ -118,12 +127,13 @@ jobs: COSIGN_PASSWORD: ${{secrets.COSIGN_PWD}} COSIGN_PRIVATE_KEY: ${{secrets.COSIGN_PRIVATE_KEY}} GITHUB_TOKEN: ${{ secrets.GIT_BOT_TOKEN }} + # ToDo: We should change this to some other user, a test account pushing images and artifacts for jx org sounds wrong! GIT_USERNAME: jenkins-x-bot-test - DOCKER_REGISTRY_ORG: jenkins-x-bot-test + DOCKER_REGISTRY_ORG: jenkins-x REPO_NAME: ${{ github.event.repository.name }} run: | - cosign sign --key=env://COSIGN_PRIVATE_KEY ghcr.io/$DOCKER_REGISTRY_ORG/$REPO_NAME:$VERSION - cosign sign --key=env://COSIGN_PRIVATE_KEY ghcr.io/$DOCKER_REGISTRY_ORG/jx-boot:$VERSION + cosign sign --key=env://COSIGN_PRIVATE_KEY ghcr.io/$DOCKER_REGISTRY_ORG/$REPO_NAME:$DIGEST_SHA_JX + cosign sign --key=env://COSIGN_PRIVATE_KEY ghcr.io/$DOCKER_REGISTRY_ORG/jx-boot:$DIGEST_SHA_JX_BOOT release2: if: github.repository_owner == 'jenkins-x' runs-on: ubuntu-latest diff --git a/cmd/docs/main.go b/cmd/docs/main.go index 19e36ee744..97e1f553c5 100644 --- a/cmd/docs/main.go +++ b/cmd/docs/main.go @@ -4,7 +4,7 @@ // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/cmd/docs/md_docs.go b/cmd/docs/md_docs.go index 36ac06b6f8..b98d532c38 100644 --- a/cmd/docs/md_docs.go +++ b/cmd/docs/md_docs.go @@ -4,7 +4,7 @@ // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/hack/linter.sh b/hack/linter.sh index 7873061a25..f63bb804c6 100755 --- a/hack/linter.sh +++ b/hack/linter.sh @@ -11,7 +11,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" linterVersion="$(golangci-lint --version | awk '{print $4}')" -expectedLinterVersion=1.46.2 +expectedLinterVersion=1.50.1 if [ "${linterVersion}" != "${expectedLinterVersion}" ]; then echo "Install GolangCI-Lint version ${expectedLinterVersion}"