From a8d028a160abdeb032e46ef897149152fc804d97 Mon Sep 17 00:00:00 2001 From: asafMasa Date: Sun, 10 Aug 2025 18:20:49 +0300 Subject: [PATCH 1/8] chore: fix docker build --- .github/workflows/pull_request.yaml | 18 ++++++++++++++++++ Dockerfile | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/pull_request.yaml diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml new file mode 100644 index 000000000..eb3ec32cf --- /dev/null +++ b/.github/workflows/pull_request.yaml @@ -0,0 +1,18 @@ +name: pull_request + +on: [pull_request] + +jobs: + pull_request: + runs-on: ubuntu-latest + steps: + - name: Check out Project Git repository + uses: actions/checkout@v4 + + - name: Build Docker Image + id: build_docker_image + uses: MapColonies/shared-workflows/actions/build-docker@build-docker-v1 + with: + registry: ${{ secrets.ACR_URL }} + + diff --git a/Dockerfile b/Dockerfile index c255f027a..467cac301 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,7 +36,7 @@ # # ================================================================= -FROM python:3.8-slim-buster +FROM python:3.8-slim LABEL maintainer="massimods@met.no,aheimsbakk@met.no,tommkralidis@gmail.com" RUN apt-get update && apt-get install --yes \ From b6700e680037fa053592ac122f51cadfb0bfd331 Mon Sep 17 00:00:00 2001 From: asafMasa Date: Sun, 10 Aug 2025 18:26:00 +0300 Subject: [PATCH 2/8] chore: fix docker build --- .github/workflows/pull_request.yaml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml index eb3ec32cf..8373fb157 100644 --- a/.github/workflows/pull_request.yaml +++ b/.github/workflows/pull_request.yaml @@ -5,14 +5,15 @@ on: [pull_request] jobs: pull_request: runs-on: ubuntu-latest + env: + Docker_Repository: ${{ secrets.ACR_URL }}/${{ github.event.repository.name }}:${{ github.ref_name }} steps: - name: Check out Project Git repository uses: actions/checkout@v4 + + - name: downcase repository + run: | + echo "Docker_Repository=${Docker_Repository,,}" >>${GITHUB_ENV} - name: Build Docker Image - id: build_docker_image - uses: MapColonies/shared-workflows/actions/build-docker@build-docker-v1 - with: - registry: ${{ secrets.ACR_URL }} - - + run: docker build . -t ${{ env.Docker_Repository }} From a8035560f190aff5590e2eb905b6ba57b486a2f5 Mon Sep 17 00:00:00 2001 From: Asaf Masa Date: Mon, 11 Aug 2025 17:27:55 +0300 Subject: [PATCH 3/8] fix: try fix pr --- .github/workflows/pull_request.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml index 8373fb157..e6a941847 100644 --- a/.github/workflows/pull_request.yaml +++ b/.github/workflows/pull_request.yaml @@ -16,4 +16,4 @@ jobs: echo "Docker_Repository=${Docker_Repository,,}" >>${GITHUB_ENV} - name: Build Docker Image - run: docker build . -t ${{ env.Docker_Repository }} + run: docker build -t ${{ env.Docker_Repository }} . From 39297564fc3589d157e29c705958aa6cc4756490 Mon Sep 17 00:00:00 2001 From: Asaf Masa Date: Mon, 11 Aug 2025 17:36:44 +0300 Subject: [PATCH 4/8] fix: try fix pr --- .github/workflows/pull_request.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml index e6a941847..c52505905 100644 --- a/.github/workflows/pull_request.yaml +++ b/.github/workflows/pull_request.yaml @@ -16,4 +16,4 @@ jobs: echo "Docker_Repository=${Docker_Repository,,}" >>${GITHUB_ENV} - name: Build Docker Image - run: docker build -t ${{ env.Docker_Repository }} . + run: docker build . From 20ba833c3ef79e893b88b04dbb2d2032ad36cf0b Mon Sep 17 00:00:00 2001 From: Asaf Masa Date: Mon, 11 Aug 2025 22:16:57 +0300 Subject: [PATCH 5/8] chore: add jira workflow --- .github/workflows/jira-integration.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .github/workflows/jira-integration.yaml diff --git a/.github/workflows/jira-integration.yaml b/.github/workflows/jira-integration.yaml new file mode 100644 index 000000000..83915ec15 --- /dev/null +++ b/.github/workflows/jira-integration.yaml @@ -0,0 +1,14 @@ +name: Jira Integration +on: + pull_request: + types: [opened, edited, synchronize] + +permissions: + statuses: write + pull-requests: write + +jobs: + jira-validation: + runs-on: ubuntu-latest + steps: + - uses: mapcolonies/javascript-github-actions/actions/jira-integration@jira-integration-v1.0.1 From a0cf4f545fd24803883366e08e035ef9d4ae5cdf Mon Sep 17 00:00:00 2001 From: Asaf <18442671+asafMasa@users.noreply.github.com> Date: Wed, 13 Aug 2025 12:13:46 +0300 Subject: [PATCH 6/8] Update .github/workflows/jira-integration.yaml Co-authored-by: Shimon Cohen <33935191+shimoncohen@users.noreply.github.com> --- .github/workflows/jira-integration.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/jira-integration.yaml b/.github/workflows/jira-integration.yaml index 83915ec15..ae5bf5d6e 100644 --- a/.github/workflows/jira-integration.yaml +++ b/.github/workflows/jira-integration.yaml @@ -1,7 +1,7 @@ name: Jira Integration on: pull_request: - types: [opened, edited, synchronize] + types: [opened, edited] permissions: statuses: write From 70922f77777a85649724a5b415a1e415f64d8a07 Mon Sep 17 00:00:00 2001 From: Asaf Masa Date: Wed, 13 Aug 2025 12:18:31 +0300 Subject: [PATCH 7/8] chore: fix cr comments --- .github/workflows/{pull_request.yaml => build_image_test.yaml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .github/workflows/{pull_request.yaml => build_image_test.yaml} (94%) diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/build_image_test.yaml similarity index 94% rename from .github/workflows/pull_request.yaml rename to .github/workflows/build_image_test.yaml index c52505905..62df95c1c 100644 --- a/.github/workflows/pull_request.yaml +++ b/.github/workflows/build_image_test.yaml @@ -1,4 +1,4 @@ -name: pull_request +name: build docker image on: [pull_request] From 196b77d6e2e1ffc6ee0fc71adb5e3042e181712f Mon Sep 17 00:00:00 2001 From: Asaf Masa Date: Wed, 13 Aug 2025 18:41:26 +0300 Subject: [PATCH 8/8] chore: fix cr comments to have same convention for workflows file names --- .github/workflows/{build_and_push.yaml => build-and-push.yaml} | 0 .../workflows/{build_image_test.yaml => build-image-test.yaml} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{build_and_push.yaml => build-and-push.yaml} (100%) rename .github/workflows/{build_image_test.yaml => build-image-test.yaml} (100%) diff --git a/.github/workflows/build_and_push.yaml b/.github/workflows/build-and-push.yaml similarity index 100% rename from .github/workflows/build_and_push.yaml rename to .github/workflows/build-and-push.yaml diff --git a/.github/workflows/build_image_test.yaml b/.github/workflows/build-image-test.yaml similarity index 100% rename from .github/workflows/build_image_test.yaml rename to .github/workflows/build-image-test.yaml