Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/go_modules/github.com/equinix-lab…
Browse files Browse the repository at this point in the history
…s/otel-init-go-0.0.9
  • Loading branch information
mergify[bot] authored Oct 4, 2023
2 parents b96dea6 + bf5381f commit fcb6d63
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ jobs:
run: chmod +x hegel-linux-*

- name: Generate image tags
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
id: meta
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -132,17 +132,17 @@ jobs:
type=sha
- name: Login to quay.io
uses: docker/login-action@v2
uses: docker/login-action@v3
if: ${{ startsWith(github.ref, 'refs/heads/main') || startsWith(github.ref, 'refs/heads/v') }}
with:
registry: ${{ env.REGISTRY }}
username: ${{ secrets.QUAY_USERNAME }}
password: ${{ secrets.QUAY_PASSWORD }}

- uses: docker/setup-buildx-action@v2
- uses: docker/setup-buildx-action@v3

- name: Build images and push
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: ./
cache-from: type=registry,ref=${{ env.IMAGE }}:latest
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/latest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Login to quay.io
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ secrets.QUAY_USERNAME }}
password: ${{ secrets.QUAY_PASSWORD }}

- uses: docker/setup-buildx-action@v2
- uses: docker/setup-buildx-action@v3

- name: Tag and push
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- uses: actions/checkout@v4

- name: Login to quay.io
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ secrets.QUAY_USERNAME }}
Expand All @@ -26,7 +26,7 @@ jobs:
# ci.yaml workflow.
- name: Generate source image name
id: src
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
images: ${{ env.IMAGE }}
Expand All @@ -35,7 +35,7 @@ jobs:

- name: Generate image release tags
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
images: ${{ env.IMAGE }}
Expand Down

0 comments on commit fcb6d63

Please sign in to comment.