From 848c4b96613026c96ac47e0780bab7220adcd681 Mon Sep 17 00:00:00 2001 From: Lucas Vas Date: Mon, 22 Dec 2025 09:17:09 -0500 Subject: [PATCH 1/5] ci: make repo name lowercase --- .github/workflows/test-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml index 9c53a1f..55a5a60 100644 --- a/.github/workflows/test-build.yml +++ b/.github/workflows/test-build.yml @@ -28,4 +28,4 @@ jobs: uses: docker/build-push-action@v6 with: push: true - tags: ghcr.io/R15-Software-Dev/scholarships-runner:latest \ No newline at end of file + tags: ghcr.io/r15-software-dev/scholarships-runner:latest \ No newline at end of file -- 2.54.0 From 9ca4db2367c48afe20ea35ba0ca329a43fca8728 Mon Sep 17 00:00:00 2001 From: Lucas Vas Date: Mon, 22 Dec 2025 09:49:18 -0500 Subject: [PATCH 2/5] ci: alter docker-compose.yml to reflect image name --- docker-compose.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index cc725fa..d4fb058 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,5 @@ services: scholarships-rs: - build: . - image: scholarships-rs-runner:latest + image: ghcr.io/r15-software-dev/scholarships-runner:latest ports: - - '8080:8080' + - '3000:8080' -- 2.54.0 From e1b14d24570d9a38e59adc54dacd5fdac9182fd2 Mon Sep 17 00:00:00 2001 From: Lucas Vas Date: Mon, 22 Dec 2025 09:59:43 -0500 Subject: [PATCH 3/5] ci: create test build and release build actions --- .github/workflows/pull-test-build.yml | 19 +++++++++++++++++++ ...est-build.yml => release-build-runner.yml} | 9 +++++---- 2 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 .github/workflows/pull-test-build.yml rename .github/workflows/{test-build.yml => release-build-runner.yml} (91%) diff --git a/.github/workflows/pull-test-build.yml b/.github/workflows/pull-test-build.yml new file mode 100644 index 0000000..f4b1d40 --- /dev/null +++ b/.github/workflows/pull-test-build.yml @@ -0,0 +1,19 @@ +name: Docker build test + +on: + pull_request: + branches: + - "main" + - "develop" + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v6 + + - name: Build image + run: | + docker build . \ No newline at end of file diff --git a/.github/workflows/test-build.yml b/.github/workflows/release-build-runner.yml similarity index 91% rename from .github/workflows/test-build.yml rename to .github/workflows/release-build-runner.yml index 55a5a60..c7f8e03 100644 --- a/.github/workflows/test-build.yml +++ b/.github/workflows/release-build-runner.yml @@ -1,8 +1,9 @@ +name: Release + on: - pull_request: + push: branches: - - main - - develop + - "main" workflow_dispatch: permissions: @@ -10,7 +11,7 @@ permissions: packages: write jobs: - build: + release: runs-on: ubuntu-latest steps: -- 2.54.0 From 175295b29830e98de98b4e2e362280e9392013f3 Mon Sep 17 00:00:00 2001 From: Lucas Vas Date: Mon, 22 Dec 2025 10:08:44 -0500 Subject: [PATCH 4/5] ci: update release workflow to accept tag pushes only --- .github/workflows/release-build-runner.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-build-runner.yml b/.github/workflows/release-build-runner.yml index c7f8e03..82abc19 100644 --- a/.github/workflows/release-build-runner.yml +++ b/.github/workflows/release-build-runner.yml @@ -2,8 +2,8 @@ name: Release on: push: - branches: - - "main" + tags: + - "v*" workflow_dispatch: permissions: @@ -29,4 +29,4 @@ jobs: uses: docker/build-push-action@v6 with: push: true - tags: ghcr.io/r15-software-dev/scholarships-runner:latest \ No newline at end of file + tags: ghcr.io/r15-software-dev/scholarships-runner:${{ github.ref_name }} \ No newline at end of file -- 2.54.0 From 5890d4bcf9ad7d56539e21b6c2dc901610869b2e Mon Sep 17 00:00:00 2001 From: Lucas Vas Date: Mon, 22 Dec 2025 10:09:18 -0500 Subject: [PATCH 5/5] ci: remove workflow_dispatch from release action --- .github/workflows/release-build-runner.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/release-build-runner.yml b/.github/workflows/release-build-runner.yml index 82abc19..37b94c9 100644 --- a/.github/workflows/release-build-runner.yml +++ b/.github/workflows/release-build-runner.yml @@ -4,7 +4,6 @@ on: push: tags: - "v*" - workflow_dispatch: permissions: contents: read -- 2.54.0