Skip to content

Commit

Permalink
Merge branch 'develop' into fix/warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
poshul authored Nov 7, 2024
2 parents a5a2010 + 7750146 commit 5281d83
Show file tree
Hide file tree
Showing 80 changed files with 3,894 additions and 1,526 deletions.
17 changes: 9 additions & 8 deletions .github/workflows/containerdeploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
- nightly
tags:
- "Release*"
- "Release/*"

jobs:
DeployDocker:
Expand All @@ -31,18 +32,18 @@ jobs:
run: echo "repo=${GITHUB_REPOSITORY,,}" >> $GITHUB_OUTPUT
id: downcase_repo
- name: Checkout repository because we need to build contrib
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: true
if: startsWith(steps.extract_branch.outputs.branch, 'release/')
- name: Login to GitHub Container Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Build contrib container using the correct submodule hash
uses: docker/build-push-action@v3
uses: docker/build-push-action@v6
with:
push: true
context: contrib
Expand All @@ -61,7 +62,7 @@ jobs:
git checkout ${{ steps.extract_branch.outputs.branch }} || git checkout master
fi
- name: Build and Push Docker Library Image
uses: docker/build-push-action@v3
uses: docker/build-push-action@v6
with:
push: true # Will only build if this is not here
context: dockerfiles/library
Expand All @@ -71,7 +72,7 @@ jobs:
tags: |
ghcr.io/${{ steps.downcase_repo.outputs.repo }}-library:${{ steps.tag_name.outputs.tag }}
- name: Build and Push Docker Tools Image
uses: docker/build-push-action@v3
uses: docker/build-push-action@v6
with:
push: true # Will only build if this is not here
context: dockerfiles/executables
Expand Down Expand Up @@ -105,18 +106,18 @@ jobs:
run: echo "repo=${GITHUB_REPOSITORY,,}" >> $GITHUB_OUTPUT
id: downcase_repo
- name: Checkout repository because we need to build contrib
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: true
if: startsWith(steps.extract_branch.outputs.branch, 'release/')
- name: Login to GitHub Container Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Build contrib container using the correct submodule hash
uses: docker/build-push-action@v3
uses: docker/build-push-action@v6
with:
push: true
context: contrib
Expand Down
Loading

0 comments on commit 5281d83

Please sign in to comment.