From 67e40dab436f386a19f193b005a42abc480e4d94 Mon Sep 17 00:00:00 2001 From: Joao M Date: Mon, 11 Nov 2024 13:21:49 -0600 Subject: [PATCH 1/5] Update to support Build on PRs --- .github/workflows/build.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 969d076..e45c985 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -77,9 +77,13 @@ jobs: result = [] tags.split("\n").forEach(function (item) { short_tag = item.trim().split(":")[1]; + result.push(short_tag); if (short_tag != "latest") { result.push(short_tag); } + if (short_tag == "master" || short_tag == "main") { + result.push("latest"); + } }) return result.join(","); result-encoding: string @@ -97,7 +101,7 @@ jobs: RELEASE_VERSION_ARG="${{ steps.tags.outputs.result }}" platforms: linux/amd64,linux/arm64 push: ${{ github.event_name != 'pull_request' || github.event.inputs.push == 'true' }} - tags: ${{ steps.meta.outputs.tags }} + tags: ${{ steps.tags.outputs.result }} labels: ${{ steps.meta.outputs.labels }} outputs: From cc5fb83dab62d5fc219874497a320b43776161c2 Mon Sep 17 00:00:00 2001 From: Joao M Date: Mon, 11 Nov 2024 13:26:33 -0600 Subject: [PATCH 2/5] Update build.yml --- .github/workflows/build.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e45c985..759271f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -76,13 +76,12 @@ jobs: tags = `${{ join(steps.meta.outputs.tags, ',') }}` result = [] tags.split("\n").forEach(function (item) { + echo item; short_tag = item.trim().split(":")[1]; - result.push(short_tag); - if (short_tag != "latest") { - result.push(short_tag); - } if (short_tag == "master" || short_tag == "main") { result.push("latest"); + } else if (short_tag != "latest") { + result.push(short_tag); } }) return result.join(","); From 775b1c4cc7fbf77e59c37e8515e28f0d3508aacc Mon Sep 17 00:00:00 2001 From: Joao M Date: Mon, 11 Nov 2024 13:29:39 -0600 Subject: [PATCH 3/5] Update build.yml --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 759271f..47d5c3a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -76,7 +76,6 @@ jobs: tags = `${{ join(steps.meta.outputs.tags, ',') }}` result = [] tags.split("\n").forEach(function (item) { - echo item; short_tag = item.trim().split(":")[1]; if (short_tag == "master" || short_tag == "main") { result.push("latest"); @@ -86,7 +85,8 @@ jobs: }) return result.join(","); result-encoding: string - - name: Get result + + - name: Get Tags run: echo "${{ steps.tags.outputs.result }}" # Build and push Docker image with Buildx (don't push on PR) From cd230528f004fb9b19032519f71ec18d27c899ae Mon Sep 17 00:00:00 2001 From: Joao M Date: Mon, 11 Nov 2024 13:39:45 -0600 Subject: [PATCH 4/5] Update build.yml --- .github/workflows/build.yml | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 47d5c3a..8b29454 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -87,7 +87,29 @@ jobs: result-encoding: string - name: Get Tags - run: echo "${{ steps.tags.outputs.result }}" + run: | + echo "${{ steps.tags.outputs.result }}" + + - uses: actions/github-script@v6 + id: normalized + with: + script: | + tags = `${{ join(steps.meta.outputs.tags, ',') }}` + result = [] + tags.split("\n").forEach(function (item) { + short_tag = item.trim().split(":")[1]; + if (short_tag == "master" || short_tag == "main") { + result.push("${{ env.IMAGE_NAME }}:latest"); + } else if (short_tag != "latest") { + result.push("${{ env.IMAGE_NAME }}:" + short_tag); + } + }) + return result.join(","); + result-encoding: string + + - name: Get Normalized Docker Image + run: | + echo "${{ steps.normalized.outputs.result }}" # Build and push Docker image with Buildx (don't push on PR) # https://github.com/docker/build-push-action @@ -100,7 +122,7 @@ jobs: RELEASE_VERSION_ARG="${{ steps.tags.outputs.result }}" platforms: linux/amd64,linux/arm64 push: ${{ github.event_name != 'pull_request' || github.event.inputs.push == 'true' }} - tags: ${{ steps.tags.outputs.result }} + tags: ${{ steps.normalized.outputs.result }} labels: ${{ steps.meta.outputs.labels }} outputs: @@ -139,7 +161,9 @@ jobs: CURRENT_VERSION=$(grep "appVersion: " helm/easyhaproxy/Chart.yaml | sed 's#appVersion: "\(.*\)"#\1#g') if [ "$TAG" = "$CURRENT_VERSION" ]; then - echo "Skipping update version..." + echo "Skipping version $CURRENT_VERSION..." + elif [ "$TAG" = "latest" ]; then + echo "Skipping latest version..." else sed -i "s#easy-haproxy:[a-zA-Z0-9\.-]*#easy-haproxy:$TAG#g" deploy/docker/docker-compose.yml sed -i "s#version: \"[a-zA-Z0-9\.-]*\"#version: \"$TAG\"#g" deploy/kubernetes/easyhaproxy-*.yml From 95f0163c0a2bee4d7d138c96c0fc4af9af183b98 Mon Sep 17 00:00:00 2001 From: Joao Gilberto Magalhaes Date: Tue, 12 Nov 2024 20:35:56 -0600 Subject: [PATCH 5/5] Upload PyCharm default tests --- .run/pytest in tests.run.xml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .run/pytest in tests.run.xml diff --git a/.run/pytest in tests.run.xml b/.run/pytest in tests.run.xml new file mode 100644 index 0000000..9b5784c --- /dev/null +++ b/.run/pytest in tests.run.xml @@ -0,0 +1,21 @@ + + + + + \ No newline at end of file