Skip to content

Commit

Permalink
Refactor: Update CI files
Browse files Browse the repository at this point in the history
Signed-off-by: The Oh Brothers Bot <bot@theohbrothers.com>
  • Loading branch information
theohbrothersbot committed Feb 25, 2024
1 parent 60317c5 commit cdea2f1
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 48 deletions.
84 changes: 42 additions & 42 deletions .github/workflows/ci-master-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Display system info (linux)
run: |
Expand All @@ -61,7 +61,7 @@ jobs:
uses: docker/setup-buildx-action@v2

- name: Cache Docker layers
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-3.17-${{ github.sha }}
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
- name: 3.17 - Build (PRs)
# Run only on pull requests
if: github.event_name == 'pull_request'
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: variants/3.17
platforms:
Expand All @@ -119,7 +119,7 @@ jobs:
- name: 3.17 - Build and push (master)
# Run only on master
if: github.ref == 'refs/heads/master'
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: variants/3.17
platforms:
Expand All @@ -132,7 +132,7 @@ jobs:

- name: 3.17 - Build and push (release)
if: startsWith(github.ref, 'refs/tags/')
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: variants/3.17
platforms:
Expand Down Expand Up @@ -173,7 +173,7 @@ jobs:
- name: 3.17-mysqlclient - Build (PRs)
# Run only on pull requests
if: github.event_name == 'pull_request'
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: variants/3.17-mysqlclient
platforms:
Expand All @@ -187,7 +187,7 @@ jobs:
- name: 3.17-mysqlclient - Build and push (master)
# Run only on master
if: github.ref == 'refs/heads/master'
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: variants/3.17-mysqlclient
platforms:
Expand All @@ -200,7 +200,7 @@ jobs:

- name: 3.17-mysqlclient - Build and push (release)
if: startsWith(github.ref, 'refs/tags/')
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: variants/3.17-mysqlclient
platforms:
Expand Down Expand Up @@ -240,7 +240,7 @@ jobs:
- name: 3.17-openssl - Build (PRs)
# Run only on pull requests
if: github.event_name == 'pull_request'
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: variants/3.17-openssl
platforms:
Expand All @@ -254,7 +254,7 @@ jobs:
- name: 3.17-openssl - Build and push (master)
# Run only on master
if: github.ref == 'refs/heads/master'
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: variants/3.17-openssl
platforms:
Expand All @@ -267,7 +267,7 @@ jobs:

- name: 3.17-openssl - Build and push (release)
if: startsWith(github.ref, 'refs/tags/')
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: variants/3.17-openssl
platforms:
Expand Down Expand Up @@ -307,7 +307,7 @@ jobs:
- name: 3.17-mysqlclient-openssl - Build (PRs)
# Run only on pull requests
if: github.event_name == 'pull_request'
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: variants/3.17-mysqlclient-openssl
platforms:
Expand All @@ -321,7 +321,7 @@ jobs:
- name: 3.17-mysqlclient-openssl - Build and push (master)
# Run only on master
if: github.ref == 'refs/heads/master'
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: variants/3.17-mysqlclient-openssl
platforms:
Expand All @@ -334,7 +334,7 @@ jobs:

- name: 3.17-mysqlclient-openssl - Build and push (release)
if: startsWith(github.ref, 'refs/tags/')
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: variants/3.17-mysqlclient-openssl
platforms:
Expand All @@ -358,7 +358,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Display system info (linux)
run: |
Expand All @@ -382,7 +382,7 @@ jobs:
uses: docker/setup-buildx-action@v2

- name: Cache Docker layers
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-3.15-${{ github.sha }}
Expand Down Expand Up @@ -426,7 +426,7 @@ jobs:
- name: 3.15 - Build (PRs)
# Run only on pull requests
if: github.event_name == 'pull_request'
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: variants/3.15
platforms:
Expand All @@ -440,7 +440,7 @@ jobs:
- name: 3.15 - Build and push (master)
# Run only on master
if: github.ref == 'refs/heads/master'
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: variants/3.15
platforms:
Expand All @@ -453,7 +453,7 @@ jobs:

- name: 3.15 - Build and push (release)
if: startsWith(github.ref, 'refs/tags/')
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: variants/3.15
platforms:
Expand Down Expand Up @@ -494,7 +494,7 @@ jobs:
- name: 3.15-mysqlclient - Build (PRs)
# Run only on pull requests
if: github.event_name == 'pull_request'
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: variants/3.15-mysqlclient
platforms:
Expand All @@ -508,7 +508,7 @@ jobs:
- name: 3.15-mysqlclient - Build and push (master)
# Run only on master
if: github.ref == 'refs/heads/master'
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: variants/3.15-mysqlclient
platforms:
Expand All @@ -521,7 +521,7 @@ jobs:

- name: 3.15-mysqlclient - Build and push (release)
if: startsWith(github.ref, 'refs/tags/')
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: variants/3.15-mysqlclient
platforms:
Expand Down Expand Up @@ -561,7 +561,7 @@ jobs:
- name: 3.15-openssl - Build (PRs)
# Run only on pull requests
if: github.event_name == 'pull_request'
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: variants/3.15-openssl
platforms:
Expand All @@ -575,7 +575,7 @@ jobs:
- name: 3.15-openssl - Build and push (master)
# Run only on master
if: github.ref == 'refs/heads/master'
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: variants/3.15-openssl
platforms:
Expand All @@ -588,7 +588,7 @@ jobs:

- name: 3.15-openssl - Build and push (release)
if: startsWith(github.ref, 'refs/tags/')
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: variants/3.15-openssl
platforms:
Expand Down Expand Up @@ -628,7 +628,7 @@ jobs:
- name: 3.15-mysqlclient-openssl - Build (PRs)
# Run only on pull requests
if: github.event_name == 'pull_request'
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: variants/3.15-mysqlclient-openssl
platforms:
Expand All @@ -642,7 +642,7 @@ jobs:
- name: 3.15-mysqlclient-openssl - Build and push (master)
# Run only on master
if: github.ref == 'refs/heads/master'
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: variants/3.15-mysqlclient-openssl
platforms:
Expand All @@ -655,7 +655,7 @@ jobs:

- name: 3.15-mysqlclient-openssl - Build and push (release)
if: startsWith(github.ref, 'refs/tags/')
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: variants/3.15-mysqlclient-openssl
platforms:
Expand All @@ -679,7 +679,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Display system info (linux)
run: |
Expand All @@ -703,7 +703,7 @@ jobs:
uses: docker/setup-buildx-action@v2

- name: Cache Docker layers
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-3.12-${{ github.sha }}
Expand Down Expand Up @@ -747,7 +747,7 @@ jobs:
- name: 3.12 - Build (PRs)
# Run only on pull requests
if: github.event_name == 'pull_request'
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: variants/3.12
platforms:
Expand All @@ -761,7 +761,7 @@ jobs:
- name: 3.12 - Build and push (master)
# Run only on master
if: github.ref == 'refs/heads/master'
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: variants/3.12
platforms:
Expand All @@ -774,7 +774,7 @@ jobs:

- name: 3.12 - Build and push (release)
if: startsWith(github.ref, 'refs/tags/')
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: variants/3.12
platforms:
Expand Down Expand Up @@ -815,7 +815,7 @@ jobs:
- name: 3.12-mysqlclient - Build (PRs)
# Run only on pull requests
if: github.event_name == 'pull_request'
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: variants/3.12-mysqlclient
platforms:
Expand All @@ -829,7 +829,7 @@ jobs:
- name: 3.12-mysqlclient - Build and push (master)
# Run only on master
if: github.ref == 'refs/heads/master'
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: variants/3.12-mysqlclient
platforms:
Expand All @@ -842,7 +842,7 @@ jobs:

- name: 3.12-mysqlclient - Build and push (release)
if: startsWith(github.ref, 'refs/tags/')
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: variants/3.12-mysqlclient
platforms:
Expand Down Expand Up @@ -882,7 +882,7 @@ jobs:
- name: 3.12-openssl - Build (PRs)
# Run only on pull requests
if: github.event_name == 'pull_request'
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: variants/3.12-openssl
platforms:
Expand All @@ -896,7 +896,7 @@ jobs:
- name: 3.12-openssl - Build and push (master)
# Run only on master
if: github.ref == 'refs/heads/master'
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: variants/3.12-openssl
platforms:
Expand All @@ -909,7 +909,7 @@ jobs:

- name: 3.12-openssl - Build and push (release)
if: startsWith(github.ref, 'refs/tags/')
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: variants/3.12-openssl
platforms:
Expand Down Expand Up @@ -949,7 +949,7 @@ jobs:
- name: 3.12-mysqlclient-openssl - Build (PRs)
# Run only on pull requests
if: github.event_name == 'pull_request'
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: variants/3.12-mysqlclient-openssl
platforms:
Expand All @@ -963,7 +963,7 @@ jobs:
- name: 3.12-mysqlclient-openssl - Build and push (master)
# Run only on master
if: github.ref == 'refs/heads/master'
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: variants/3.12-mysqlclient-openssl
platforms:
Expand All @@ -976,7 +976,7 @@ jobs:

- name: 3.12-mysqlclient-openssl - Build and push (release)
if: startsWith(github.ref, 'refs/tags/')
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: variants/3.12-mysqlclient-openssl
platforms:
Expand Down
Loading

0 comments on commit cdea2f1

Please sign in to comment.