From a55b32154420ea96b4b789aedaa886e00d0ed0a5 Mon Sep 17 00:00:00 2001 From: Karsten Thoms Date: Thu, 27 Nov 2025 06:40:48 +0100 Subject: [PATCH 1/5] chore: use runner ubuntu-latest --- .github/workflows/build-test-and-publish.yml | 4 ++-- .github/workflows/pull-request-build-test.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-test-and-publish.yml b/.github/workflows/build-test-and-publish.yml index ff9e9c0..131f2c4 100644 --- a/.github/workflows/build-test-and-publish.yml +++ b/.github/workflows/build-test-and-publish.yml @@ -35,7 +35,7 @@ on: types: [published] jobs: build-and-test: - runs-on: ubuntu-24.04 + runs-on: ubuntu-latest strategy: fail-fast: false matrix: @@ -83,7 +83,7 @@ jobs: IMAGE_REPO_TOMCAT: ${{ vars.IMAGE_REPO_TOMCAT }} IMAGE_REPO_WILDFLY: ${{ vars.IMAGE_REPO_WILDFLY }} publish: - runs-on: ubuntu-24.04 + runs-on: ubuntu-latest needs: build-and-test strategy: matrix: diff --git a/.github/workflows/pull-request-build-test.yml b/.github/workflows/pull-request-build-test.yml index cf1119a..5dac012 100644 --- a/.github/workflows/pull-request-build-test.yml +++ b/.github/workflows/pull-request-build-test.yml @@ -5,7 +5,7 @@ on: - main jobs: build-and-test: - runs-on: ubuntu-24.04 + runs-on: ubuntu-latest strategy: fail-fast: false matrix: From 9e1a2f12a8bf67dd8859e5f70182ea80895fb118 Mon Sep 17 00:00:00 2001 From: Karsten Thoms Date: Thu, 27 Nov 2025 06:41:23 +0100 Subject: [PATCH 2/5] fix: Download url changed for snapshot builds --- download.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/download.sh b/download.sh index 406f760..ff8d748 100755 --- a/download.sh +++ b/download.sh @@ -28,7 +28,7 @@ ARTIFACT_BASE_URL="https://github.com/operaton/operaton/releases/download/v${VER # Determine if SNAPSHOT version should be used if [ "${SNAPSHOT}" = "true" ]; then ARTIFACT_VERSION="${VERSION}-SNAPSHOT" - ARTIFACT_BASE_URL="https://github.com/operaton/operaton/releases/download/early-access/" + ARTIFACT_BASE_URL="https://github.com/operaton/operaton/releases/download/${ARTIFACT_VERSION}/" # get the database settings file from the main repo since snapshots are not published wget -q https://raw.githubusercontent.com/operaton/operaton/refs/heads/main/database/pom.xml -O dbpom.xml From fc9ce5621c17ec461e590b2d7aabf2a8d9ebcaa8 Mon Sep 17 00:00:00 2001 From: Karsten Thoms Date: Thu, 27 Nov 2025 06:42:44 +0100 Subject: [PATCH 3/5] chore: Use defaults for image repos when not set --- pipeline.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pipeline.sh b/pipeline.sh index e90e7ac..650bf7c 100755 --- a/pipeline.sh +++ b/pipeline.sh @@ -12,6 +12,17 @@ else VERSION_ARGUMENT="--build-arg VERSION=${VERSION}" fi +if [ -z "$IMAGE_REPO_OPERATON" ]; then + IMAGE_REPO_OPERATON="operaton/operaton" +fi +if [ -z "$IMAGE_REPO_TOMCAT" ]; then + IMAGE_REPO_TOMCAT="operaton/operaton-tomcat" +fi +if [ -z "$IMAGE_REPO_WILDFLY" ]; then + IMAGE_REPO_WILDFLY="operaton/operaton-wildfly" +fi + + if [ "$DISTRO" == "run" ]; then IMAGE_NAME=${IMAGE_REPO_OPERATON}:${PLATFORM} elif [ "$DISTRO" == "tomcat" ]; then From 5d6cc047909313e72c05b4d647a7fab35156d6d4 Mon Sep 17 00:00:00 2001 From: Karsten Thoms Date: Thu, 27 Nov 2025 06:43:03 +0100 Subject: [PATCH 4/5] chore: Add script to execute with act --- .github/act/build-and-test.sh | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100755 .github/act/build-and-test.sh diff --git a/.github/act/build-and-test.sh b/.github/act/build-and-test.sh new file mode 100755 index 0000000..fff9e4f --- /dev/null +++ b/.github/act/build-and-test.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env bash + +cat > event.json <<'EOF' +{ + "ref": "refs/heads/fix-1.1.0-snapshot-build", + "inputs": { + "version": "1.1.0", + "snapshot": "true", + "distribution": "[\"run\"]", + "platform": "[\"amd64\"]" + + } +} +EOF + +act --container-architecture linux/amd64 \ + -W .github/workflows/build-test-and-publish.yml \ + -e event.json \ + workflow_dispatch + From 1933901ae564076017ffbf10738763fc433c76aa Mon Sep 17 00:00:00 2001 From: Karsten Thoms Date: Fri, 28 Nov 2025 12:16:47 +0100 Subject: [PATCH 5/5] chore: Apply suggestions from code review Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .github/act/build-and-test.sh | 9 +++++---- pipeline.sh | 1 - 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/act/build-and-test.sh b/.github/act/build-and-test.sh index fff9e4f..fd73a97 100755 --- a/.github/act/build-and-test.sh +++ b/.github/act/build-and-test.sh @@ -1,14 +1,16 @@ #!/usr/bin/env bash -cat > event.json <<'EOF' +# Allow branch ref to be set via environment variable or argument, default to "refs/heads/main" +BRANCH_REF="${1:-${BRANCH_REF:-refs/heads/main}}" + +cat > event.json <