From 9633ba74b64f2029b14544ca2a35dc91ba1e0950 Mon Sep 17 00:00:00 2001 From: Shine Works Date: Mon, 27 Jul 2026 15:23:58 +1000 Subject: [PATCH 1/2] Simplify GitHub Actions release workflows to not use custom action --- .../actions/release-major-action/Dockerfile | 3 --- .../actions/release-major-action/action.yaml | 4 ---- .../actions/release-major-action/entrypoint.sh | 4 ---- .../actions/release-minor-action/Dockerfile | 3 --- .../actions/release-minor-action/action.yaml | 4 ---- .../actions/release-minor-action/entrypoint.sh | 4 ---- .../actions/release-patch-action/Dockerfile | 3 --- .../actions/release-patch-action/action.yaml | 4 ---- .../actions/release-patch-action/entrypoint.sh | 4 ---- .github/workflows/release-major-workflow.yaml | 18 ++++++------------ .github/workflows/release-minor-workflow.yaml | 18 ++++++------------ .github/workflows/release-patch-workflow.yaml | 18 ++++++------------ CHANGELOG.md | 3 +++ 13 files changed, 21 insertions(+), 69 deletions(-) delete mode 100644 .github/actions/release-major-action/Dockerfile delete mode 100644 .github/actions/release-major-action/action.yaml delete mode 100755 .github/actions/release-major-action/entrypoint.sh delete mode 100644 .github/actions/release-minor-action/Dockerfile delete mode 100644 .github/actions/release-minor-action/action.yaml delete mode 100755 .github/actions/release-minor-action/entrypoint.sh delete mode 100644 .github/actions/release-patch-action/Dockerfile delete mode 100644 .github/actions/release-patch-action/action.yaml delete mode 100755 .github/actions/release-patch-action/entrypoint.sh diff --git a/.github/actions/release-major-action/Dockerfile b/.github/actions/release-major-action/Dockerfile deleted file mode 100644 index 8f6d011..0000000 --- a/.github/actions/release-major-action/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM ghcr.io/shinesolutions/the-works-buildenv:1.8.0 -COPY entrypoint.sh /entrypoint.sh -ENTRYPOINT ["/entrypoint.sh"] diff --git a/.github/actions/release-major-action/action.yaml b/.github/actions/release-major-action/action.yaml deleted file mode 100644 index 5c2b2a3..0000000 --- a/.github/actions/release-major-action/action.yaml +++ /dev/null @@ -1,4 +0,0 @@ -name: 'Release Major' -runs: - using: 'docker' - image: 'Dockerfile' diff --git a/.github/actions/release-major-action/entrypoint.sh b/.github/actions/release-major-action/entrypoint.sh deleted file mode 100755 index 392ebea..0000000 --- a/.github/actions/release-major-action/entrypoint.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -git config --global user.email "opensource@shinesolutions.com" -git config --global user.name "Shine Open Source" -make release-major \ No newline at end of file diff --git a/.github/actions/release-minor-action/Dockerfile b/.github/actions/release-minor-action/Dockerfile deleted file mode 100644 index 8f6d011..0000000 --- a/.github/actions/release-minor-action/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM ghcr.io/shinesolutions/the-works-buildenv:1.8.0 -COPY entrypoint.sh /entrypoint.sh -ENTRYPOINT ["/entrypoint.sh"] diff --git a/.github/actions/release-minor-action/action.yaml b/.github/actions/release-minor-action/action.yaml deleted file mode 100644 index 520bcdc..0000000 --- a/.github/actions/release-minor-action/action.yaml +++ /dev/null @@ -1,4 +0,0 @@ -name: 'Release Minor' -runs: - using: 'docker' - image: 'Dockerfile' diff --git a/.github/actions/release-minor-action/entrypoint.sh b/.github/actions/release-minor-action/entrypoint.sh deleted file mode 100755 index cea827d..0000000 --- a/.github/actions/release-minor-action/entrypoint.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -git config --global user.email "opensource@shinesolutions.com" -git config --global user.name "Shine Open Source" -make release-minor \ No newline at end of file diff --git a/.github/actions/release-patch-action/Dockerfile b/.github/actions/release-patch-action/Dockerfile deleted file mode 100644 index 8f6d011..0000000 --- a/.github/actions/release-patch-action/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM ghcr.io/shinesolutions/the-works-buildenv:1.8.0 -COPY entrypoint.sh /entrypoint.sh -ENTRYPOINT ["/entrypoint.sh"] diff --git a/.github/actions/release-patch-action/action.yaml b/.github/actions/release-patch-action/action.yaml deleted file mode 100644 index 6fa4148..0000000 --- a/.github/actions/release-patch-action/action.yaml +++ /dev/null @@ -1,4 +0,0 @@ -name: 'Release Patch' -runs: - using: 'docker' - image: 'Dockerfile' diff --git a/.github/actions/release-patch-action/entrypoint.sh b/.github/actions/release-patch-action/entrypoint.sh deleted file mode 100755 index d2f52ad..0000000 --- a/.github/actions/release-patch-action/entrypoint.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -git config --global user.email "opensource@shinesolutions.com" -git config --global user.name "Shine Open Source" -make release-patch \ No newline at end of file diff --git a/.github/workflows/release-major-workflow.yaml b/.github/workflows/release-major-workflow.yaml index 9144ff9..b797e8c 100644 --- a/.github/workflows/release-major-workflow.yaml +++ b/.github/workflows/release-major-workflow.yaml @@ -3,17 +3,11 @@ name: Release Major on: [workflow_dispatch] jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v3 - - uses: docker/login-action@v1 + - uses: cliffano/release-action@v2.0.0 with: - registry: ghcr.io - username: shinesolutions - password: ${{ secrets.SHINEOPENSOURCE_GITHUB_TOKEN }} - - uses: ./.github/actions/release-major-action - - uses: ad-m/github-push-action@master - with: - tags: true - github_token: ${{ secrets.SHINEOPENSOURCE_GITHUB_TOKEN }} - branch: ${{ github.ref }} + release_type: major + github_token: ${{ secrets.SHINEWORKS_GITHUB_TOKEN }} + git_user_email: shinesworks@shinesolutions.com + git_user_name: Shine Works diff --git a/.github/workflows/release-minor-workflow.yaml b/.github/workflows/release-minor-workflow.yaml index f7721e6..dd5651e 100644 --- a/.github/workflows/release-minor-workflow.yaml +++ b/.github/workflows/release-minor-workflow.yaml @@ -3,17 +3,11 @@ name: Release Minor on: [workflow_dispatch] jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v3 - - uses: docker/login-action@v1 + - uses: cliffano/release-action@v2.0.0 with: - registry: ghcr.io - username: shinesolutions - password: ${{ secrets.SHINEOPENSOURCE_GITHUB_TOKEN }} - - uses: ./.github/actions/release-minor-action - - uses: ad-m/github-push-action@master - with: - tags: true - github_token: ${{ secrets.SHINEOPENSOURCE_GITHUB_TOKEN }} - branch: ${{ github.ref }} + release_type: minor + github_token: ${{ secrets.SHINEWORKS_GITHUB_TOKEN }} + git_user_email: shinesworks@shinesolutions.com + git_user_name: Shine Works diff --git a/.github/workflows/release-patch-workflow.yaml b/.github/workflows/release-patch-workflow.yaml index d188e8c..adbbf45 100644 --- a/.github/workflows/release-patch-workflow.yaml +++ b/.github/workflows/release-patch-workflow.yaml @@ -3,17 +3,11 @@ name: Release Patch on: [workflow_dispatch] jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v3 - - uses: docker/login-action@v1 + - uses: cliffano/release-action@v2.0.0 with: - registry: ghcr.io - username: shinesolutions - password: ${{ secrets.SHINEOPENSOURCE_GITHUB_TOKEN }} - - uses: ./.github/actions/release-patch-action - - uses: ad-m/github-push-action@master - with: - tags: true - github_token: ${{ secrets.SHINEOPENSOURCE_GITHUB_TOKEN }} - branch: ${{ github.ref }} + release_type: patch + github_token: ${{ secrets.SHINEWORKS_GITHUB_TOKEN }} + git_user_email: shinesworks@shinesolutions.com + git_user_name: Shine Works diff --git a/CHANGELOG.md b/CHANGELOG.md index 68b0fe5..e1ae2f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased +### Changed +- Simplify GitHub Actions release workflows to not use custom action + ## 3.17.0 - 2024-07-29 ### Added - Add relaxed SSL setting to replication agent when destination is HTTPS #RS-194 From 3c37b007f1f6757490ce02e712939ecbb6e4cc0d Mon Sep 17 00:00:00 2001 From: Shine Works Date: Mon, 27 Jul 2026 17:13:55 +1000 Subject: [PATCH 2/2] Fix release workflow to use SHINEOPENSOURCE_GITHUB_TOKEN --- .github/workflows/release-major-workflow.yaml | 2 +- .github/workflows/release-minor-workflow.yaml | 2 +- .github/workflows/release-patch-workflow.yaml | 2 +- CHANGELOG.md | 3 +++ 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-major-workflow.yaml b/.github/workflows/release-major-workflow.yaml index b797e8c..49e2936 100644 --- a/.github/workflows/release-major-workflow.yaml +++ b/.github/workflows/release-major-workflow.yaml @@ -8,6 +8,6 @@ jobs: - uses: cliffano/release-action@v2.0.0 with: release_type: major - github_token: ${{ secrets.SHINEWORKS_GITHUB_TOKEN }} + github_token: ${{ secrets.SHINEOPENSOURCE_GITHUB_TOKEN }} git_user_email: shinesworks@shinesolutions.com git_user_name: Shine Works diff --git a/.github/workflows/release-minor-workflow.yaml b/.github/workflows/release-minor-workflow.yaml index dd5651e..2b0affb 100644 --- a/.github/workflows/release-minor-workflow.yaml +++ b/.github/workflows/release-minor-workflow.yaml @@ -8,6 +8,6 @@ jobs: - uses: cliffano/release-action@v2.0.0 with: release_type: minor - github_token: ${{ secrets.SHINEWORKS_GITHUB_TOKEN }} + github_token: ${{ secrets.SHINEOPENSOURCE_GITHUB_TOKEN }} git_user_email: shinesworks@shinesolutions.com git_user_name: Shine Works diff --git a/.github/workflows/release-patch-workflow.yaml b/.github/workflows/release-patch-workflow.yaml index adbbf45..6e3cc13 100644 --- a/.github/workflows/release-patch-workflow.yaml +++ b/.github/workflows/release-patch-workflow.yaml @@ -8,6 +8,6 @@ jobs: - uses: cliffano/release-action@v2.0.0 with: release_type: patch - github_token: ${{ secrets.SHINEWORKS_GITHUB_TOKEN }} + github_token: ${{ secrets.SHINEOPENSOURCE_GITHUB_TOKEN }} git_user_email: shinesworks@shinesolutions.com git_user_name: Shine Works diff --git a/CHANGELOG.md b/CHANGELOG.md index e1ae2f7..7eb39e2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Simplify GitHub Actions release workflows to not use custom action +### Fixed +- Fix release workflows to use SHINEOPENSOURCE_GITHUB_TOKEN instead of SHINEWORKS_GITHUB_TOKEN, matching this repo's original token + ## 3.17.0 - 2024-07-29 ### Added - Add relaxed SSL setting to replication agent when destination is HTTPS #RS-194