Skip to content

Commit

Permalink
adopt focal builder; drop redhat7 and ubuntu bionic cpack builds;
Browse files Browse the repository at this point in the history
  • Loading branch information
qrkourier authored and scareything committed Jul 9, 2024
1 parent 59fa4f6 commit e0f1d4e
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,17 @@ jobs:
preset: windows-arm64-vs2022

- os: ubuntu-20.04
container: openziti/ziti-builder:2.0.1
container: openziti/ziti-builder:v2
name: Linux x86_64
preset: linux-x64

- os: ubuntu-20.04
container: openziti/ziti-builder:2.0.1
container: openziti/ziti-builder:v2
name: Linux arm
preset: linux-arm

- os: ubuntu-20.04
container: openziti/ziti-builder:2.0.1
container: openziti/ziti-builder:v2
name: Linux arm64
preset: linux-arm64

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/promote-downstreams.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ jobs:
ZITI_HOST_IMAGE: ${{ vars.ZITI_HOST_IMAGE || 'docker.io/openziti/ziti-host' }}
steps:
- name: Login to Docker Hub
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ vars.DOCKER_HUB_API_USER || secrets.DOCKER_HUB_API_USER }}
password: ${{ secrets.DOCKER_HUB_API_TOKEN }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ jobs:

- name: Set up Docker BuildKit
id: buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Login to Docker Hub
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ vars.DOCKER_HUB_API_USER || secrets.DOCKER_HUB_API_USER }}
password: ${{ secrets.DOCKER_HUB_API_TOKEN }}
Expand Down

0 comments on commit e0f1d4e

Please sign in to comment.