Skip to content

Commit

Permalink
Fix release process
Browse files Browse the repository at this point in the history
  • Loading branch information
burmanm committed Jul 19, 2024
1 parent 6d6f0ac commit 6cebbba
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 29 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/build-client.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ jobs:
env:
CGO_ENABLED: 0
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
if: github.event_name == 'pull_request'
with:
ref: ${{ github.event.pull_request.head.sha }}
- uses: actions/checkout@v3
- uses: actions/checkout@v4
if: github.event_name != 'pull_request'
- name: Set up Go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version-file: 'go.mod'
cache: true
Expand All @@ -42,13 +42,13 @@ jobs:
if: github.ref == 'refs/heads/main'
steps:
- name: Check out code into the Go module directory
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
- name: Login to DockerHub
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_HUB_USERNAME }}
password: ${{ secrets.DOCKER_HUB_PASSWORD }}
Expand All @@ -60,7 +60,7 @@ jobs:
mkdir -p build/
- name: Build and push
id: docker_build
uses: docker/build-push-action@v3
uses: docker/build-push-action@v6
with:
load: false
file: cmd/kubectl-k8ssandra/Dockerfile
Expand Down
37 changes: 23 additions & 14 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,24 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out code into the Go module directory
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Set up Go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version-file: 'go.mod'
cache: true
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- name: Login to DockerHub
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_HUB_USERNAME }}
password: ${{ secrets.DOCKER_HUB_PASSWORD }}
- name: Login to GitHub Container Registry
if: ${{ !env.ACT }}
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
Expand All @@ -43,7 +43,7 @@ jobs:
mkdir -p build/
- name: Build and push
id: docker_build
uses: docker/build-push-action@v3
uses: docker/build-push-action@v6
with:
load: false
file: cmd/kubectl-k8ssandra/Dockerfile
Expand All @@ -53,13 +53,23 @@ jobs:
platforms: linux/amd64,linux/arm64
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache
- name: Login to Quay.io
uses: docker/login-action@v3
with:
username: redhat-isv-containers+64f725593ba91d38e7246955-robot
password: ${{ secrets.K8SSANDRA_CLIENT_CONNECT_SECRET }}
- name: Tag and push images for Red Hat certification
shell: bash
if: ${{ !env.ACT }}
run: |
docker tag k8ssandra/k8ssandra-client:${{ steps.vars.outputs.tag_name}} quay.io/redhat-isv-containers/64f725593ba91d38e7246955:${{ steps.vars.outputs.tag_name}}
docker login -u redhat-isv-containers+64f725593ba91d38e7246955-robot quay.io -p ${{ secrets.K8SSANDRA_CLIENT_CONNECT_SECRET }}
docker push quay.io/redhat-isv-containers/64f725593ba91d38e7246955:${{ steps.vars.outputs.tag_name}}
id: docker_build_redhat
uses: docker/build-push-action@v6
with:
load: false
file: cmd/kubectl-k8ssandra/Dockerfile
push: true
context: .
tags: quay.io/redhat-isv-containers/64f725593ba91d38e7246955:${{ steps.vars.outputs.tag_name}}
platforms: linux/amd64,linux/arm64
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache
- name: Install CLI tools from OpenShift Mirror
uses: redhat-actions/openshift-tools-installer@v1
with:
Expand All @@ -74,7 +84,6 @@ jobs:
- name: Run preflight checks and submit results
shell: bash
run: |
docker login -u redhat-isv-containers+5ebee0e40e3deaf258b160d1-robot quay.io -p ${{ secrets.K8SSANDRA_CLIENT_CONNECT_SECRET }}
preflight check container quay.io/redhat-isv-containers/64f725593ba91d38e7246955:${{ steps.vars.outputs.tag_name}} --certification-project-id=64f725593ba91d38e7246955 --pyxis-api-token=${{ secrets.PREFLIGHT_KEY }} --submit --docker-config=$HOME/.docker/config.json
goreleaser:
runs-on: ubuntu-latest
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/tools-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,20 +37,20 @@ jobs:
GH_TOKEN: ${{ secrets[format('{0}', inputs.tokenSecret)] }}
steps:
- name: Check out code into the Go module directory
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- uses: azure/setup-helm@v3
uses: docker/setup-buildx-action@v3
- uses: azure/setup-helm@v4
if: ${{ env.ACT }}
with:
version: '3.13.1'
version: '3.14.0'
id: install
- name: Set up QEMU
if: ${{ !env.ACT }}
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
- name: Login to DockerHub
if: ${{ !env.ACT }}
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_HUB_USERNAME }}
password: ${{ secrets.DOCKER_HUB_PASSWORD }}
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:
helm dependency update build/${{ inputs.repoName }}
- name: Build and push
id: docker_build
uses: docker/build-push-action@v3
uses: docker/build-push-action@v6
with:
load: false
file: cmd/kubectl-k8ssandra/Dockerfile
Expand Down

0 comments on commit 6cebbba

Please sign in to comment.