From 15a482aa95f23689c551f874e388fc07a86b2a0f Mon Sep 17 00:00:00 2001 From: Graham Gilbert Date: Wed, 6 Nov 2024 16:13:04 -0800 Subject: [PATCH] Unify image builds --- .github/workflows/build-latest.yml | 15 ++++++++++- .github/workflows/build-release.yml | 16 +++++++++-- .github/workflows/build-saml-latest.yml | 34 ------------------------ .github/workflows/build-saml-release.yml | 33 ----------------------- sal/version.plist | 2 +- 5 files changed, 29 insertions(+), 71 deletions(-) delete mode 100644 .github/workflows/build-saml-latest.yml delete mode 100644 .github/workflows/build-saml-release.yml diff --git a/.github/workflows/build-latest.yml b/.github/workflows/build-latest.yml index a7ba42f1..61916cca 100644 --- a/.github/workflows/build-latest.yml +++ b/.github/workflows/build-latest.yml @@ -19,9 +19,22 @@ jobs: password: ${{secrets.GITHUB_TOKEN}} - name: Build and Push Docker image - id: push uses: docker/build-push-action@v6.9.0 with: context: . push: true tags: ghcr.io/salopensource/sal:latest + + - name: Checkout SAML repository + uses: actions/checkout@v2 + with: + repository: salopensource/sal-saml + path: saml + + - name: Build and Push Docker image + uses: docker/build-push-action@v6.9.0 + with: + context: saml + file: saml/Dockerfile + push: true + tags: ghcr.io/salopensource/sal-saml:latest diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 96dc6758..4bb7e097 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -18,10 +18,22 @@ jobs: password: ${{secrets.GITHUB_TOKEN}} - name: Build and Push Docker image - id: push uses: docker/build-push-action@v6.9.0 with: context: . push: true tags: ghcr.io/salopensource/sal:${{ github.ref_name }} - \ No newline at end of file + + - name: Checkout another repository + uses: actions/checkout@v2 + with: + repository: salopensource/sal-saml + path: saml + + - name: Build and Push Docker image + uses: docker/build-push-action@v6.9.0 + with: + context: saml + push: true + file: saml/Dockerfile + tags: ghcr.io/salopensource/sal-saml:${{ github.ref_name }} \ No newline at end of file diff --git a/.github/workflows/build-saml-latest.yml b/.github/workflows/build-saml-latest.yml deleted file mode 100644 index b3ae28cf..00000000 --- a/.github/workflows/build-saml-latest.yml +++ /dev/null @@ -1,34 +0,0 @@ -name: Build Latest SAML - -on: - push: - branches: - - 'main' - -jobs: - build-saml: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - - name: Checkout another repository - uses: actions/checkout@v2 - with: - repository: salopensource/sal-saml - path: saml - - - name: 'Login to GitHub Container Registry' - uses: docker/login-action@v1 - with: - registry: ghcr.io - username: ${{github.actor}} - password: ${{secrets.GITHUB_TOKEN}} - - - name: Build and Push Docker image - id: push - uses: docker/build-push-action@v6.9.0 - with: - context: saml - file: saml/Dockerfile - push: true - tags: ghcr.io/salopensource/sal-saml:latest diff --git a/.github/workflows/build-saml-release.yml b/.github/workflows/build-saml-release.yml deleted file mode 100644 index c7849f32..00000000 --- a/.github/workflows/build-saml-release.yml +++ /dev/null @@ -1,33 +0,0 @@ -name: Build SAML Release - -on: - release: - types: [published] - -jobs: - build-saml-tag: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - - name: Checkout another repository - uses: actions/checkout@v2 - with: - repository: salopensource/sal-saml - path: saml - - - name: 'Login to GitHub Container Registry' - uses: docker/login-action@v1 - with: - registry: ghcr.io - username: ${{github.actor}} - password: ${{secrets.GITHUB_TOKEN}} - - - name: Build and Push Docker image - id: push - uses: docker/build-push-action@v6.9.0 - with: - context: saml - push: true - file: saml/Dockerfile - tags: ghcr.io/salopensource/sal-saml:${{ github.ref_name }} diff --git a/sal/version.plist b/sal/version.plist index 0b428c94..b23957fa 100644 --- a/sal/version.plist +++ b/sal/version.plist @@ -3,6 +3,6 @@ version - 4.3.0.2299 + 4.3.0.2301