From c495ddbe2f67a1a67d86ddc5daedb06217511e5a Mon Sep 17 00:00:00 2001 From: Matlavv Date: Fri, 15 Nov 2024 11:45:51 +0100 Subject: [PATCH 001/114] test the CI - separate each steps for mor visibility on the builds --- .github/workflows/ci.yml | 67 +++++++++++++++++++++++++--------------- 1 file changed, 42 insertions(+), 25 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ecc8446..e04077c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,13 +10,18 @@ env: CHART_PATH: ./opensource jobs: - build-and-push-docker: + checkout: runs-on: ubuntu-latest steps: - name: Checkout repository uses: actions/checkout@v3 + setup-docker: + runs-on: ubuntu-latest + needs: checkout + + steps: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 with: @@ -28,38 +33,50 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} + build-and-push-docker-api: + runs-on: ubuntu-latest + needs: setup-docker + + steps: - name: Build and push Docker image API run: | docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:latest ./src/api + build-and-push-docker-job: + runs-on: ubuntu-latest + needs: setup-docker + + steps: - name: Build and push Docker image Job run: | docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:job-latest ./src + publish-helm-chart: runs-on: ubuntu-latest - needs: build-and-push-docker + needs: [build-and-push-docker-api, build-and-push-docker-job] steps: - - name: Checkout repository - uses: actions/checkout@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Log in to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - name: Install Helm - uses: azure/setup-helm@v3 - with: - version: v3.11.1 - - - name: Package Helm chart - run: | - helm package opensource - - - name: Push Helm chart to Docker Hub - run: | - helm push $(ls *.tgz) oci://registry-1.docker.io/amelieloulou \ No newline at end of file + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + + - name: Log in to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + - name: Install Helm + uses: azure/setup-helm@v3 + with: + version: v3.11.1 + + - name: Package Helm chart + run: | + helm package opensource + + - name: Push Helm chart to Docker Hub + run: | + helm push $(ls *.tgz) oci://registry-1.docker.io/amelieloulou From 63b6cfebfa65b867476a70296d1812375313d6da Mon Sep 17 00:00:00 2001 From: Matlavv Date: Fri, 15 Nov 2024 11:46:50 +0100 Subject: [PATCH 002/114] test the CI - separate each steps for mor visibility on the builds --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e04077c..28c1d0b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,7 +3,7 @@ name: CI Docker and Helm on: push: branches: - - main + - workflow/api-improve env: IMAGE_NAME: amelieloulou/transform-and-deliver-assets From 785aab664932c28f1d2cb79a515fdd66b8e04fa2 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Fri, 15 Nov 2024 11:55:18 +0100 Subject: [PATCH 003/114] [DEBUG] test the CI - separate each steps for mor visibility on the builds --- .github/workflows/ci.yml | 156 ++++++++++++++++++++------------------- 1 file changed, 81 insertions(+), 75 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 28c1d0b..71669c9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,82 +1,88 @@ name: CI Docker and Helm on: - push: - branches: - - workflow/api-improve + push: + branches: + - workflow/api-improve env: - IMAGE_NAME: amelieloulou/transform-and-deliver-assets - CHART_PATH: ./opensource + IMAGE_NAME: amelieloulou/transform-and-deliver-assets + CHART_PATH: ./opensource jobs: - checkout: - runs-on: ubuntu-latest - - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - setup-docker: - runs-on: ubuntu-latest - needs: checkout - - steps: - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - with: - install: true - - - name: Log in to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - build-and-push-docker-api: - runs-on: ubuntu-latest - needs: setup-docker - - steps: - - name: Build and push Docker image API - run: | - docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:latest ./src/api - - build-and-push-docker-job: - runs-on: ubuntu-latest - needs: setup-docker - - steps: - - name: Build and push Docker image Job - run: | - docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:job-latest ./src - - publish-helm-chart: - runs-on: ubuntu-latest - needs: [build-and-push-docker-api, build-and-push-docker-job] - - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Log in to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - - name: Install Helm - uses: azure/setup-helm@v3 - with: - version: v3.11.1 - - - name: Package Helm chart - run: | - helm package opensource - - - name: Push Helm chart to Docker Hub - run: | - helm push $(ls *.tgz) oci://registry-1.docker.io/amelieloulou + checkout: + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + setup-docker: + runs-on: ubuntu-latest + needs: checkout + + steps: + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + with: + install: true + + - name: Log in to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + build-and-push-docker-api: + runs-on: ubuntu-latest + needs: setup-docker + + steps: + - name: Debug - List files in src/api + run: ls -la ./src/api + + - name: Build and push Docker image API + run: | + docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:latest ./src/api + + build-and-push-docker-job: + runs-on: ubuntu-latest + needs: setup-docker + + steps: + - name: Debug - List files in src + run: ls -la ./src + + - name: Build and push Docker image Job + run: | + docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:job-latest ./src + + publish-helm-chart: + runs-on: ubuntu-latest + needs: [build-and-push-docker-api, build-and-push-docker-job] + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + + - name: Log in to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + - name: Install Helm + uses: azure/setup-helm@v3 + with: + version: v3.11.1 + + - name: Package Helm chart + run: | + helm package opensource + + - name: Push Helm chart to Docker Hub + run: | + helm push $(ls *.tgz) oci://registry-1.docker.io/amelieloulou From 171d1fab23ba9ef037e3d12a224f1bfc2d954555 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Fri, 15 Nov 2024 11:56:52 +0100 Subject: [PATCH 004/114] [DEBUG] test the CI - separate each steps for mor visibility on the builds --- .github/workflows/ci.yml | 139 ++++++++++++++++----------------------- 1 file changed, 58 insertions(+), 81 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 71669c9..efe2ca0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,88 +1,65 @@ name: CI Docker and Helm on: - push: - branches: - - workflow/api-improve + push: + branches: + - workflow/api-improve env: - IMAGE_NAME: amelieloulou/transform-and-deliver-assets - CHART_PATH: ./opensource + IMAGE_NAME: amelieloulou/transform-and-deliver-assets + CHART_PATH: ./opensource jobs: - checkout: - runs-on: ubuntu-latest - - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - setup-docker: - runs-on: ubuntu-latest - needs: checkout - - steps: - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - with: - install: true - - - name: Log in to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - build-and-push-docker-api: - runs-on: ubuntu-latest - needs: setup-docker - - steps: - - name: Debug - List files in src/api - run: ls -la ./src/api - - - name: Build and push Docker image API - run: | - docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:latest ./src/api - - build-and-push-docker-job: - runs-on: ubuntu-latest - needs: setup-docker - - steps: - - name: Debug - List files in src - run: ls -la ./src - - - name: Build and push Docker image Job - run: | - docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:job-latest ./src - - publish-helm-chart: - runs-on: ubuntu-latest - needs: [build-and-push-docker-api, build-and-push-docker-job] - - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Log in to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - - name: Install Helm - uses: azure/setup-helm@v3 - with: - version: v3.11.1 - - - name: Package Helm chart - run: | - helm package opensource - - - name: Push Helm chart to Docker Hub - run: | - helm push $(ls *.tgz) oci://registry-1.docker.io/amelieloulou + build-and-push-docker: + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + with: + install: true + + - name: Log in to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + - name: Build and push Docker image API + run: | + docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:latest ./src/api + + - name: Build and push Docker image Job + run: | + docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:job-latest ./src + publish-helm-chart: + runs-on: ubuntu-latest + needs: build-and-push-docker + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + + - name: Log in to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + - name: Install Helm + uses: azure/setup-helm@v3 + with: + version: v3.11.1 + + - name: Package Helm chart + run: | + helm package opensource + + - name: Push Helm chart to Docker Hub + run: | + helm push $(ls *.tgz) oci://registry-1.docker.io/amelieloulou From 4d29434c251b347061582d20bee7fcd5b76ac1d4 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Fri, 15 Nov 2024 12:08:28 +0100 Subject: [PATCH 005/114] [DEBUG] test the CI - separate each steps for mor visibility on the builds --- .github/workflows/ci.yml | 121 ++++++++++++++++++++++----------------- 1 file changed, 69 insertions(+), 52 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index efe2ca0..cc11d9e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,56 +10,73 @@ env: CHART_PATH: ./opensource jobs: - build-and-push-docker: - runs-on: ubuntu-latest - - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - with: - install: true - - - name: Log in to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - - name: Build and push Docker image API - run: | - docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:latest ./src/api - - - name: Build and push Docker image Job - run: | - docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:job-latest ./src + checkout: + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + setup-docker: + runs-on: ubuntu-latest + needs: checkout + + steps: + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + with: + install: true + + - name: Log in to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + build-and-push-docker-api: + runs-on: ubuntu-latest + needs: setup-docker + + steps: + - name: Build and push Docker image API + run: | + docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:latest ./src/api + + build-and-push-docker-job: + runs-on: ubuntu-latest + needs: setup-docker + + steps: + - name: Build and push Docker image Job + run: | + docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:job-latest ./src + publish-helm-chart: - runs-on: ubuntu-latest - needs: build-and-push-docker - - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Log in to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - name: Install Helm - uses: azure/setup-helm@v3 - with: - version: v3.11.1 - - - name: Package Helm chart - run: | - helm package opensource - - - name: Push Helm chart to Docker Hub - run: | - helm push $(ls *.tgz) oci://registry-1.docker.io/amelieloulou + runs-on: ubuntu-latest + needs: [ build-and-push-docker-api, build-and-push-docker-job ] + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + + - name: Log in to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + - name: Install Helm + uses: azure/setup-helm@v3 + with: + version: v3.11.1 + + - name: Package Helm chart + run: | + helm package opensource + + - name: Push Helm chart to Docker Hub + run: | + helm push $(ls *.tgz) oci://registry-1.docker.io/amelieloulou From e0210e512c799d62ee00543c28fde9592118ffea Mon Sep 17 00:00:00 2001 From: Matlavv Date: Fri, 15 Nov 2024 12:12:19 +0100 Subject: [PATCH 006/114] test the CI - separate each steps for mor visibility on the builds --- .github/workflows/ci.yml | 145 +++++++++++++++++++-------------------- 1 file changed, 70 insertions(+), 75 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cc11d9e..f664600 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,82 +1,77 @@ name: CI Docker and Helm on: - push: - branches: - - workflow/api-improve + push: + branches: + - main env: - IMAGE_NAME: amelieloulou/transform-and-deliver-assets - CHART_PATH: ./opensource + IMAGE_NAME: amelieloulou/transform-and-deliver-assets + CHART_PATH: ./opensource jobs: - checkout: - runs-on: ubuntu-latest - - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - setup-docker: - runs-on: ubuntu-latest - needs: checkout - - steps: - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - with: - install: true - - - name: Log in to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - build-and-push-docker-api: - runs-on: ubuntu-latest - needs: setup-docker - - steps: - - name: Build and push Docker image API - run: | - docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:latest ./src/api - - build-and-push-docker-job: - runs-on: ubuntu-latest - needs: setup-docker - - steps: - - name: Build and push Docker image Job - run: | - docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:job-latest ./src - - publish-helm-chart: - runs-on: ubuntu-latest - needs: [ build-and-push-docker-api, build-and-push-docker-job ] - - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Log in to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - - name: Install Helm - uses: azure/setup-helm@v3 - with: - version: v3.11.1 - - - name: Package Helm chart - run: | - helm package opensource - - - name: Push Helm chart to Docker Hub - run: | - helm push $(ls *.tgz) oci://registry-1.docker.io/amelieloulou + checkout: + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + setup-docker-buildx: + runs-on: ubuntu-latest + needs: [checkout] + steps: + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + with: + install: true + + docker-login: + runs-on: ubuntu-latest + needs: [setup-docker-buildx] + steps: + - name: Log in to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + build-push-docker-api: + runs-on: ubuntu-latest + needs: [docker-login] + steps: + - name: Build and push Docker image API + run: | + docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:latest ./src/api + + build-push-docker-job: + runs-on: ubuntu-latest + needs: [docker-login] + steps: + - name: Build and push Docker image Job + run: | + docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:job-latest ./src + + setup-helm: + runs-on: ubuntu-latest + needs: [build-push-docker-api, build-push-docker-job] + steps: + - name: Install Helm + uses: azure/setup-helm@v3 + with: + version: v3.11.1 + + package-helm-chart: + runs-on: ubuntu-latest + needs: [setup-helm] + steps: + - name: Package Helm chart + run: | + helm package ${{ env.CHART_PATH }} + + push-helm-chart: + runs-on: ubuntu-latest + needs: [package-helm-chart] + steps: + - name: Push Helm chart to Docker Hub + run: | + helm push $(ls *.tgz) oci://registry-1.docker.io/${{ env.IMAGE_NAME }} From 3b9616510eefa4696b0f6c1cdce4b4b4d02aebef Mon Sep 17 00:00:00 2001 From: Matlavv Date: Fri, 15 Nov 2024 12:12:55 +0100 Subject: [PATCH 007/114] test the CI - separate each steps for mor visibility on the builds --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f664600..5b7adab 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,7 +3,7 @@ name: CI Docker and Helm on: push: branches: - - main + - workflow/api-improve env: IMAGE_NAME: amelieloulou/transform-and-deliver-assets From c4dacdecc239ad71ff85396c7a481a466caa0e10 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Fri, 15 Nov 2024 12:14:50 +0100 Subject: [PATCH 008/114] test the CI - separate each steps for mor visibility on the builds --- .github/workflows/ci.yml | 64 ++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 38 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5b7adab..39bbb1d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,68 +10,56 @@ env: CHART_PATH: ./opensource jobs: - checkout: + build-and-push-docker: runs-on: ubuntu-latest + steps: - name: Checkout repository uses: actions/checkout@v3 - setup-docker-buildx: - runs-on: ubuntu-latest - needs: [checkout] - steps: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 with: install: true - docker-login: - runs-on: ubuntu-latest - needs: [setup-docker-buildx] - steps: - name: Log in to Docker Hub uses: docker/login-action@v3 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - build-push-docker-api: - runs-on: ubuntu-latest - needs: [docker-login] - steps: - name: Build and push Docker image API run: | docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:latest ./src/api - build-push-docker-job: - runs-on: ubuntu-latest - needs: [docker-login] - steps: - name: Build and push Docker image Job run: | docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:job-latest ./src - - setup-helm: + publish-helm-chart: runs-on: ubuntu-latest - needs: [build-push-docker-api, build-push-docker-job] - steps: - - name: Install Helm - uses: azure/setup-helm@v3 - with: - version: v3.11.1 + needs: build-and-push-docker - package-helm-chart: - runs-on: ubuntu-latest - needs: [setup-helm] steps: - - name: Package Helm chart - run: | - helm package ${{ env.CHART_PATH }} + - name: Checkout repository + uses: actions/checkout@v3 - push-helm-chart: - runs-on: ubuntu-latest - needs: [package-helm-chart] - steps: - - name: Push Helm chart to Docker Hub - run: | - helm push $(ls *.tgz) oci://registry-1.docker.io/${{ env.IMAGE_NAME }} + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + + - name: Log in to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + - name: Install Helm + uses: azure/setup-helm@v3 + with: + version: v3.11.1 + + - name: Package Helm chart + run: | + helm package opensource + + - name: Push Helm chart to Docker Hub + run: | + helm push $(ls *.tgz) oci://registry-1.docker.io/amelieloulou From bd65548d6125f275684093357a6d6d7162dd369a Mon Sep 17 00:00:00 2001 From: Matlavv Date: Fri, 15 Nov 2024 12:21:32 +0100 Subject: [PATCH 009/114] test the CI - separate each steps for mor visibility on the builds --- .github/workflows/ci.yml | 59 +++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 25 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 39bbb1d..00a7c6a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ env: CHART_PATH: ./opensource jobs: - build-and-push-docker: + setup-docker: runs-on: ubuntu-latest steps: @@ -28,38 +28,47 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} + build-and-push-api: + runs-on: ubuntu-latest + needs: setup-docker + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + - name: Build and push Docker image API run: | docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:latest ./src/api + build-and-push-job: + runs-on: ubuntu-latest + needs: setup-docker + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + - name: Build and push Docker image Job run: | docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:job-latest ./src + publish-helm-chart: runs-on: ubuntu-latest - needs: build-and-push-docker + needs: setup-docker steps: - - name: Checkout repository - uses: actions/checkout@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Log in to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - name: Install Helm - uses: azure/setup-helm@v3 - with: - version: v3.11.1 - - - name: Package Helm chart - run: | - helm package opensource - - - name: Push Helm chart to Docker Hub - run: | - helm push $(ls *.tgz) oci://registry-1.docker.io/amelieloulou + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Install Helm + uses: azure/setup-helm@v3 + with: + version: v3.11.1 + + - name: Package Helm chart + run: | + helm package opensource + + - name: Push Helm chart to Docker Hub + run: | + helm push $(ls *.tgz) oci://registry-1.docker.io/amelieloulou From 127cc4aa2d34376ed80917a6d60f10a0bd607644 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Fri, 15 Nov 2024 12:24:24 +0100 Subject: [PATCH 010/114] test the CI - separate each steps for mor visibility on the builds --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 00a7c6a..c78f0fa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -54,7 +54,7 @@ jobs: publish-helm-chart: runs-on: ubuntu-latest - needs: setup-docker + needs: [setup-docker, build-and-push-api, build-and-push-job] steps: - name: Checkout repository From 6634d1a457ea5f6b6f058359b753d26f6067b8d3 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Fri, 15 Nov 2024 12:27:57 +0100 Subject: [PATCH 011/114] test the CI - separate each steps for mor visibility on the builds --- .github/workflows/ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c78f0fa..6933b8f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,6 +22,11 @@ jobs: with: install: true + - name: Create and use builder + run: | + docker buildx create --use --name mybuilder --driver docker-container + docker buildx inspect mybuilder --bootstrap + - name: Log in to Docker Hub uses: docker/login-action@v3 with: From 1c627dc3dc648455e9ef943f83c6966fb4f078fe Mon Sep 17 00:00:00 2001 From: Matlavv Date: Fri, 15 Nov 2024 15:03:17 +0100 Subject: [PATCH 012/114] test the CI - separate each steps for mor visibility on the builds --- .github/workflows/ci.yml | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6933b8f..982b3e2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,16 +3,15 @@ name: CI Docker and Helm on: push: branches: - - workflow/api-improve + - main env: IMAGE_NAME: amelieloulou/transform-and-deliver-assets CHART_PATH: ./opensource jobs: - setup-docker: + setup: runs-on: ubuntu-latest - steps: - name: Checkout repository uses: actions/checkout@v3 @@ -22,20 +21,15 @@ jobs: with: install: true - - name: Create and use builder - run: | - docker buildx create --use --name mybuilder --driver docker-container - docker buildx inspect mybuilder --bootstrap - - name: Log in to Docker Hub uses: docker/login-action@v3 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - build-and-push-api: + build-and-push-docker-api: runs-on: ubuntu-latest - needs: setup-docker + needs: setup steps: - name: Checkout repository @@ -45,9 +39,9 @@ jobs: run: | docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:latest ./src/api - build-and-push-job: + build-and-push-docker-job: runs-on: ubuntu-latest - needs: setup-docker + needs: setup steps: - name: Checkout repository @@ -57,9 +51,9 @@ jobs: run: | docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:job-latest ./src - publish-helm-chart: + package-helm-chart: runs-on: ubuntu-latest - needs: [setup-docker, build-and-push-api, build-and-push-job] + needs: setup steps: - name: Checkout repository @@ -72,7 +66,21 @@ jobs: - name: Package Helm chart run: | - helm package opensource + helm package ${env.CHART_PATH} + + push-helm-chart: + runs-on: ubuntu-latest + needs: package-helm-chart + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Log in to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} - name: Push Helm chart to Docker Hub run: | From abd0a8b432eea524fb37f01ad8876f3fbb9a2b6b Mon Sep 17 00:00:00 2001 From: Matlavv Date: Fri, 15 Nov 2024 15:03:52 +0100 Subject: [PATCH 013/114] test the CI - separate each steps for mor visibility on the builds --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 982b3e2..3213009 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,7 +3,7 @@ name: CI Docker and Helm on: push: branches: - - main + - workflow/api-improve env: IMAGE_NAME: amelieloulou/transform-and-deliver-assets From 436d75f6de9997cdcdddac207ebbcd3de6f8e1d1 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Fri, 15 Nov 2024 15:09:15 +0100 Subject: [PATCH 014/114] test the CI - separate each steps for mor visibility on the builds --- .github/workflows/ci.yml | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3213009..433553a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,8 +10,9 @@ env: CHART_PATH: ./opensource jobs: - setup: + setup-docker: runs-on: ubuntu-latest + steps: - name: Checkout repository uses: actions/checkout@v3 @@ -29,7 +30,7 @@ jobs: build-and-push-docker-api: runs-on: ubuntu-latest - needs: setup + needs: setup-docker steps: - name: Checkout repository @@ -41,7 +42,7 @@ jobs: build-and-push-docker-job: runs-on: ubuntu-latest - needs: setup + needs: setup-docker steps: - name: Checkout repository @@ -51,14 +52,25 @@ jobs: run: | docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:job-latest ./src - package-helm-chart: + publish-helm-chart: runs-on: ubuntu-latest - needs: setup + needs: + - build-and-push-docker-api + - build-and-push-docker-job steps: - name: Checkout repository uses: actions/checkout@v3 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + + - name: Log in to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + - name: Install Helm uses: azure/setup-helm@v3 with: @@ -66,21 +78,7 @@ jobs: - name: Package Helm chart run: | - helm package ${env.CHART_PATH} - - push-helm-chart: - runs-on: ubuntu-latest - needs: package-helm-chart - - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - - name: Log in to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} + helm package opensource - name: Push Helm chart to Docker Hub run: | From eeb9b1069558bd8362b8d172a29ac55df894c048 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Fri, 15 Nov 2024 15:12:07 +0100 Subject: [PATCH 015/114] test the CI - separate each steps for mor visibility on the builds --- .github/workflows/ci.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 433553a..1957c1a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,6 +36,11 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + with: + install: true + - name: Build and push Docker image API run: | docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:latest ./src/api @@ -48,6 +53,11 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + with: + install: true + - name: Build and push Docker image Job run: | docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:job-latest ./src From 7b0786ef9658473104763ffcb488f1f616adb0ed Mon Sep 17 00:00:00 2001 From: Matlavv Date: Fri, 15 Nov 2024 15:19:53 +0100 Subject: [PATCH 016/114] test the CI - separate each steps for mor visibility on the builds --- .github/workflows/ci.yml | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1957c1a..fbb33ba 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ env: CHART_PATH: ./opensource jobs: - setup-docker: + build-and-push-docker-api: runs-on: ubuntu-latest steps: @@ -28,26 +28,12 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - build-and-push-docker-api: - runs-on: ubuntu-latest - needs: setup-docker - - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - with: - install: true - - name: Build and push Docker image API run: | docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:latest ./src/api build-and-push-docker-job: runs-on: ubuntu-latest - needs: setup-docker steps: - name: Checkout repository @@ -58,6 +44,12 @@ jobs: with: install: true + - name: Log in to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + - name: Build and push Docker image Job run: | docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:job-latest ./src From 213602ff3770c6d9d048e7625f94a03f61380e47 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Fri, 15 Nov 2024 15:30:29 +0100 Subject: [PATCH 017/114] test the CI - separate each steps for mor visibility on the builds --- .github/workflows/ci.yml | 34 ++++++------------------------ .github/workflows/setup-docker.yml | 15 +++++++++++++ 2 files changed, 21 insertions(+), 28 deletions(-) create mode 100644 .github/workflows/setup-docker.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fbb33ba..56fcf89 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,16 +17,8 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - with: - install: true - - - name: Log in to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} + - name: Setup Docker Buildx and Login + uses: ./setup-docker - name: Build and push Docker image API run: | @@ -39,16 +31,8 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - with: - install: true - - - name: Log in to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} + - name: Setup Docker Buildx and Login + uses: ./setup-docker - name: Build and push Docker image Job run: | @@ -64,14 +48,8 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Log in to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} + - name: Setup Docker Buildx and Login + uses: ./setup-docker - name: Install Helm uses: azure/setup-helm@v3 diff --git a/.github/workflows/setup-docker.yml b/.github/workflows/setup-docker.yml new file mode 100644 index 0000000..327a681 --- /dev/null +++ b/.github/workflows/setup-docker.yml @@ -0,0 +1,15 @@ +name: 'Setup Docker Buildx and Login' +description: 'Setup Docker Buildx and Login to Docker Hub' +runs: + using: 'composite' + steps: + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + with: + install: true + + - name: Log in to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} From 9fc33ea1dfeba3ed889aefe197a98e1ebd1b1d1a Mon Sep 17 00:00:00 2001 From: Matlavv Date: Fri, 15 Nov 2024 15:35:26 +0100 Subject: [PATCH 018/114] test the CI - separate each steps for mor visibility on the builds --- .github/workflows/ci.yml | 20 ++++++---------- .github/workflows/setup-docker.yml | 37 ++++++++++++++++++------------ 2 files changed, 29 insertions(+), 28 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 56fcf89..994c9a9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,11 +14,8 @@ jobs: runs-on: ubuntu-latest steps: - - name: Checkout repository - uses: actions/checkout@v3 - - - name: Setup Docker Buildx and Login - uses: ./setup-docker + - name: Setup Docker + uses: ./.github/workflows/setup-docker.yml - name: Build and push Docker image API run: | @@ -28,11 +25,8 @@ jobs: runs-on: ubuntu-latest steps: - - name: Checkout repository - uses: actions/checkout@v3 - - - name: Setup Docker Buildx and Login - uses: ./setup-docker + - name: Setup Docker + uses: ./.github/workflows/setup-docker.yml - name: Build and push Docker image Job run: | @@ -45,12 +39,12 @@ jobs: - build-and-push-docker-job steps: + - name: Setup Docker + uses: ./.github/workflows/setup-docker.yml + - name: Checkout repository uses: actions/checkout@v3 - - name: Setup Docker Buildx and Login - uses: ./setup-docker - - name: Install Helm uses: azure/setup-helm@v3 with: diff --git a/.github/workflows/setup-docker.yml b/.github/workflows/setup-docker.yml index 327a681..67ae0a5 100644 --- a/.github/workflows/setup-docker.yml +++ b/.github/workflows/setup-docker.yml @@ -1,15 +1,22 @@ -name: 'Setup Docker Buildx and Login' -description: 'Setup Docker Buildx and Login to Docker Hub' -runs: - using: 'composite' - steps: - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - with: - install: true - - - name: Log in to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} +name: Setup Docker + +on: [workflow_call] + +jobs: + setup-docker: + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + with: + install: true + + - name: Log in to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} From db1fd876227b7baa41a78ac4643bd7afd22124fb Mon Sep 17 00:00:00 2001 From: Matlavv Date: Fri, 15 Nov 2024 15:37:33 +0100 Subject: [PATCH 019/114] test the CI - separate each steps for mor visibility on the builds --- .github/workflows/ci.yml | 69 +++++++++++++++++----------------------- 1 file changed, 30 insertions(+), 39 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 994c9a9..ed77f2e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,49 +11,40 @@ env: jobs: build-and-push-docker-api: - runs-on: ubuntu-latest - - steps: - - name: Setup Docker - uses: ./.github/workflows/setup-docker.yml - - - name: Build and push Docker image API - run: | - docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:latest ./src/api + uses: ./.github/workflows/setup-docker.yml + with: + steps: + - name: Build and push Docker image API + run: | + docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:latest ./src/api build-and-push-docker-job: - runs-on: ubuntu-latest - - steps: - - name: Setup Docker - uses: ./.github/workflows/setup-docker.yml - - - name: Build and push Docker image Job - run: | - docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:job-latest ./src + uses: ./.github/workflows/setup-docker.yml + with: + steps: + - name: Build and push Docker image Job + run: | + docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:job-latest ./src publish-helm-chart: - runs-on: ubuntu-latest needs: - build-and-push-docker-api - build-and-push-docker-job - - steps: - - name: Setup Docker - uses: ./.github/workflows/setup-docker.yml - - - name: Checkout repository - uses: actions/checkout@v3 - - - name: Install Helm - uses: azure/setup-helm@v3 - with: - version: v3.11.1 - - - name: Package Helm chart - run: | - helm package opensource - - - name: Push Helm chart to Docker Hub - run: | - helm push $(ls *.tgz) oci://registry-1.docker.io/amelieloulou + uses: ./.github/workflows/setup-docker.yml + with: + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Install Helm + uses: azure/setup-helm@v3 + with: + version: v3.11.1 + + - name: Package Helm chart + run: | + helm package opensource + + - name: Push Helm chart to Docker Hub + run: | + helm push $(ls *.tgz) oci://registry-1.docker.io/amelieloulou From 9335201cf0ec771137e6be98d453518af9003cae Mon Sep 17 00:00:00 2001 From: Matlavv Date: Fri, 15 Nov 2024 15:38:55 +0100 Subject: [PATCH 020/114] test the CI - separate each steps for mor visibility on the builds --- .github/workflows/ci.yml | 51 +++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 27 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ed77f2e..8f3cdf5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,39 +12,36 @@ env: jobs: build-and-push-docker-api: uses: ./.github/workflows/setup-docker.yml - with: - steps: - - name: Build and push Docker image API - run: | - docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:latest ./src/api + steps: + - name: Build and push Docker image API + run: | + docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:latest ./src/api build-and-push-docker-job: uses: ./.github/workflows/setup-docker.yml - with: - steps: - - name: Build and push Docker image Job - run: | - docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:job-latest ./src + steps: + - name: Build and push Docker image Job + run: | + docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:job-latest ./src publish-helm-chart: needs: - build-and-push-docker-api - build-and-push-docker-job uses: ./.github/workflows/setup-docker.yml - with: - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - - name: Install Helm - uses: azure/setup-helm@v3 - with: - version: v3.11.1 - - - name: Package Helm chart - run: | - helm package opensource - - - name: Push Helm chart to Docker Hub - run: | - helm push $(ls *.tgz) oci://registry-1.docker.io/amelieloulou + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Install Helm + uses: azure/setup-helm@v3 + with: + version: v3.11.1 + + - name: Package Helm chart + run: | + helm package opensource + + - name: Push Helm chart to Docker Hub + run: | + helm push $(ls *.tgz) oci://registry-1.docker.io/amelieloulou From fbefabf709ed1e9f74cbc6e9e6117f2116c3162a Mon Sep 17 00:00:00 2001 From: Matlavv Date: Fri, 15 Nov 2024 15:40:13 +0100 Subject: [PATCH 021/114] test the CI - separate each steps for mor visibility on the builds --- .github/workflows/ci.yml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8f3cdf5..787f513 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,25 +11,34 @@ env: jobs: build-and-push-docker-api: - uses: ./.github/workflows/setup-docker.yml + runs-on: ubuntu-latest steps: + - name: Setup Docker + uses: ./.github/workflows/setup-docker.yml + - name: Build and push Docker image API run: | docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:latest ./src/api build-and-push-docker-job: - uses: ./.github/workflows/setup-docker.yml + runs-on: ubuntu-latest steps: + - name: Setup Docker + uses: ./.github/workflows/setup-docker.yml + - name: Build and push Docker image Job run: | docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:job-latest ./src publish-helm-chart: + runs-on: ubuntu-latest needs: - build-and-push-docker-api - build-and-push-docker-job - uses: ./.github/workflows/setup-docker.yml steps: + - name: Setup Docker + uses: ./.github/workflows/setup-docker.yml + - name: Checkout repository uses: actions/checkout@v3 From 77c308e0ab45551b4815decb9be06947bd654078 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Fri, 15 Nov 2024 15:43:55 +0100 Subject: [PATCH 022/114] test the CI - separate each steps for mor visibility on the builds --- .github/workflows/ci.yml | 46 ++++++++++++++++++++++++------ .github/workflows/setup-docker.yml | 22 -------------- 2 files changed, 38 insertions(+), 30 deletions(-) delete mode 100644 .github/workflows/setup-docker.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 787f513..212487e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,9 +12,21 @@ env: jobs: build-and-push-docker-api: runs-on: ubuntu-latest + steps: - - name: Setup Docker - uses: ./.github/workflows/setup-docker.yml + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + with: + install: true + + - name: Log in to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} - name: Build and push Docker image API run: | @@ -22,9 +34,21 @@ jobs: build-and-push-docker-job: runs-on: ubuntu-latest + steps: - - name: Setup Docker - uses: ./.github/workflows/setup-docker.yml + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + with: + install: true + + - name: Log in to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} - name: Build and push Docker image Job run: | @@ -35,13 +59,20 @@ jobs: needs: - build-and-push-docker-api - build-and-push-docker-job - steps: - - name: Setup Docker - uses: ./.github/workflows/setup-docker.yml + steps: - name: Checkout repository uses: actions/checkout@v3 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + + - name: Log in to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + - name: Install Helm uses: azure/setup-helm@v3 with: @@ -50,7 +81,6 @@ jobs: - name: Package Helm chart run: | helm package opensource - - name: Push Helm chart to Docker Hub run: | helm push $(ls *.tgz) oci://registry-1.docker.io/amelieloulou diff --git a/.github/workflows/setup-docker.yml b/.github/workflows/setup-docker.yml deleted file mode 100644 index 67ae0a5..0000000 --- a/.github/workflows/setup-docker.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: Setup Docker - -on: [workflow_call] - -jobs: - setup-docker: - runs-on: ubuntu-latest - - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - with: - install: true - - - name: Log in to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} From 91c5b380eabe283ebeaa48fd9da5cf1b58c6354b Mon Sep 17 00:00:00 2001 From: Matlavv Date: Fri, 15 Nov 2024 16:00:02 +0100 Subject: [PATCH 023/114] test the CI - separate each steps for mor visibility on the builds --- .github/workflows/ci.yml | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 212487e..f27d7a0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,6 +17,25 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 + - name: Cache Node.js modules + uses: actions/cache@v3 + with: + path: ~/.npm + key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} + restore-keys: | + ${{ runner.os }}-node- + + - name: Install Node.js + uses: actions/setup-node@v3 + with: + node-version: '16' + + - name: Install dependencies + run: npm install + + - name: Build packages + run: npm run build + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 with: @@ -39,6 +58,25 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 + - name: Cache Node.js modules + uses: actions/cache@v3 + with: + path: ~/.npm + key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} + restore-keys: | + ${{ runner.os }}-node- + + - name: Install Node.js + uses: actions/setup-node@v3 + with: + node-version: '16' + + - name: Install dependencies + run: npm install + + - name: Build packages + run: npm run build + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 with: From 6592680126008607f76d4e09d9eb55bfd42e2868 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Fri, 15 Nov 2024 16:02:15 +0100 Subject: [PATCH 024/114] test the CI - separate each steps for mor visibility on the builds --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 5e9e62a..123d0be 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ }, "scripts": { "update-local-bru": "node local/update-local-bru.js", - "format": "prettier --write ." + "format": "prettier --write .", + "build": "tsc" } } From 58b68a2f210d8c9b43fa08b0d5e75b5e1e02412c Mon Sep 17 00:00:00 2001 From: Matlavv Date: Fri, 15 Nov 2024 16:06:03 +0100 Subject: [PATCH 025/114] try to add cache in the npm CI --- .github/workflows/ci.yml | 55 ++++++++++++---------------------------- 1 file changed, 16 insertions(+), 39 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f27d7a0..8dafa89 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,30 +17,19 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - - name: Cache Node.js modules - uses: actions/cache@v3 - with: - path: ~/.npm - key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} - restore-keys: | - ${{ runner.os }}-node- - - - name: Install Node.js - uses: actions/setup-node@v3 - with: - node-version: '16' - - - name: Install dependencies - run: npm install - - - name: Build packages - run: npm run build - - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 with: install: true + - name: Cache Docker layers + uses: actions/cache@v3 + with: + path: /tmp/.buildx-cache + key: ${{ runner.os }}-buildx-${{ github.sha }} + restore-keys: | + ${{ runner.os }}-buildx- + - name: Log in to Docker Hub uses: docker/login-action@v3 with: @@ -49,7 +38,14 @@ jobs: - name: Build and push Docker image API run: | - docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:latest ./src/api + docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:latest --cache-from type=local,src=/tmp/.buildx-cache --cache-to type=local,dest=/tmp/.buildx-cache-new ./src/api + + - name: Save cache + if: always() + uses: actions/cache@v3 + with: + path: /tmp/.buildx-cache-new + key: ${{ runner.os }}-buildx-${{ github.sha }} build-and-push-docker-job: runs-on: ubuntu-latest @@ -58,25 +54,6 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - - name: Cache Node.js modules - uses: actions/cache@v3 - with: - path: ~/.npm - key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} - restore-keys: | - ${{ runner.os }}-node- - - - name: Install Node.js - uses: actions/setup-node@v3 - with: - node-version: '16' - - - name: Install dependencies - run: npm install - - - name: Build packages - run: npm run build - - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 with: From 5ef04e2b7404a1ef77d704f7918207fb132acf14 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Fri, 15 Nov 2024 16:14:53 +0100 Subject: [PATCH 026/114] try to add cache in the docker CI --- .github/workflows/ci.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8dafa89..4142eb8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,14 +38,7 @@ jobs: - name: Build and push Docker image API run: | - docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:latest --cache-from type=local,src=/tmp/.buildx-cache --cache-to type=local,dest=/tmp/.buildx-cache-new ./src/api - - - name: Save cache - if: always() - uses: actions/cache@v3 - with: - path: /tmp/.buildx-cache-new - key: ${{ runner.os }}-buildx-${{ github.sha }} + docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:latest --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache,mode=max ./src/api build-and-push-docker-job: runs-on: ubuntu-latest @@ -59,6 +52,14 @@ jobs: with: install: true + - name: Cache Docker layers + uses: actions/cache@v3 + with: + path: /tmp/.buildx-cache + key: ${{ runner.os }}-buildx-${{ github.sha }} + restore-keys: | + ${{ runner.os }}-buildx- + - name: Log in to Docker Hub uses: docker/login-action@v3 with: @@ -67,7 +68,7 @@ jobs: - name: Build and push Docker image Job run: | - docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:job-latest ./src + docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:job-latest --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache,mode=max ./src publish-helm-chart: runs-on: ubuntu-latest From 3afb4c0927b468249a8b06446e50e3f09165616f Mon Sep 17 00:00:00 2001 From: Matlavv Date: Fri, 15 Nov 2024 16:20:31 +0100 Subject: [PATCH 027/114] Check if the cache changes anything on the build time --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4142eb8..9f66531 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,7 +36,7 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - - name: Build and push Docker image API + - name: Build and push Docker image AP run: | docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:latest --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache,mode=max ./src/api From 8ef57ffb3df77aa9cf8965e7168cde90c2d79144 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Fri, 15 Nov 2024 16:25:29 +0100 Subject: [PATCH 028/114] Check build time with the basic ci config --- .github/workflows/ci.yml | 93 ++++++++++++---------------------------- 1 file changed, 28 insertions(+), 65 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9f66531..39bbb1d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ env: CHART_PATH: ./opensource jobs: - build-and-push-docker-api: + build-and-push-docker: runs-on: ubuntu-latest steps: @@ -22,81 +22,44 @@ jobs: with: install: true - - name: Cache Docker layers - uses: actions/cache@v3 - with: - path: /tmp/.buildx-cache - key: ${{ runner.os }}-buildx-${{ github.sha }} - restore-keys: | - ${{ runner.os }}-buildx- - - name: Log in to Docker Hub uses: docker/login-action@v3 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - - name: Build and push Docker image AP + - name: Build and push Docker image API run: | - docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:latest --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache,mode=max ./src/api - - build-and-push-docker-job: - runs-on: ubuntu-latest - - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - with: - install: true - - - name: Cache Docker layers - uses: actions/cache@v3 - with: - path: /tmp/.buildx-cache - key: ${{ runner.os }}-buildx-${{ github.sha }} - restore-keys: | - ${{ runner.os }}-buildx- - - - name: Log in to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} + docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:latest ./src/api - name: Build and push Docker image Job run: | - docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:job-latest --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache,mode=max ./src - + docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:job-latest ./src publish-helm-chart: runs-on: ubuntu-latest - needs: - - build-and-push-docker-api - - build-and-push-docker-job + needs: build-and-push-docker steps: - - name: Checkout repository - uses: actions/checkout@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Log in to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - - name: Install Helm - uses: azure/setup-helm@v3 - with: - version: v3.11.1 - - - name: Package Helm chart - run: | - helm package opensource - - name: Push Helm chart to Docker Hub - run: | - helm push $(ls *.tgz) oci://registry-1.docker.io/amelieloulou + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + + - name: Log in to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + - name: Install Helm + uses: azure/setup-helm@v3 + with: + version: v3.11.1 + + - name: Package Helm chart + run: | + helm package opensource + + - name: Push Helm chart to Docker Hub + run: | + helm push $(ls *.tgz) oci://registry-1.docker.io/amelieloulou From dd26982c5280677a77df54807b3828cf96ff7137 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Fri, 15 Nov 2024 16:39:03 +0100 Subject: [PATCH 029/114] Adding npm cache to increase build time --- .github/workflows/ci.yml | 113 +++++++++++++++++++++++++++++---------- 1 file changed, 86 insertions(+), 27 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 39bbb1d..2c5264a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,18 +10,37 @@ env: CHART_PATH: ./opensource jobs: - build-and-push-docker: + build-and-push-docker-api: runs-on: ubuntu-latest steps: - name: Checkout repository uses: actions/checkout@v3 + - name: Cache npm dependencies for API + uses: actions/cache@v3 + with: + path: src/api/node_modules + key: ${{ runner.os }}-api-node-modules-${{ hashFiles('src/api/package-lock.json') }} + restore-keys: | + ${{ runner.os }}-api-node-modules- + + - name: Install npm dependencies for API + working-directory: src/api + run: npm install + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 with: install: true + - name: Cache Docker layers + uses: actions/cache@v3 + with: + path: /tmp/.buildx-cache + key: ${{ runner.os }}-buildx-${{ github.sha }} + restore-keys: | + ${{ runner.os }}-buildx- - name: Log in to Docker Hub uses: docker/login-action@v3 with: @@ -30,36 +49,76 @@ jobs: - name: Build and push Docker image API run: | - docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:latest ./src/api + docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:latest --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache,mode=max ./src/api + + build-and-push-docker-job: + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Cache npm dependencies for job + uses: actions/cache@v3 + with: + path: backup-and-clean/src/node_modules + key: ${{ runner.os }}-job-node-modules-${{ hashFiles('backup-and-clean/src/package-lock.json') }} + restore-keys: | + ${{ runner.os }}-job-node-modules- + + - name: Install npm dependencies for job + working-directory: backup-and-clean/src + run: npm install + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + with: + install: true + + - name: Cache Docker layers + uses: actions/cache@v3 + with: + path: /tmp/.buildx-cache + key: ${{ runner.os }}-buildx-${{ github.sha }} + restore-keys: | + ${{ runner.os }}-buildx- + - name: Log in to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} - name: Build and push Docker image Job run: | - docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:job-latest ./src + docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:job-latest --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache,mode=max ./src + publish-helm-chart: runs-on: ubuntu-latest - needs: build-and-push-docker + needs: + - build-and-push-docker-api + - build-and-push-docker-job steps: - - name: Checkout repository - uses: actions/checkout@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Log in to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - name: Install Helm - uses: azure/setup-helm@v3 - with: - version: v3.11.1 - - - name: Package Helm chart - run: | - helm package opensource - - - name: Push Helm chart to Docker Hub - run: | - helm push $(ls *.tgz) oci://registry-1.docker.io/amelieloulou + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + + - name: Log in to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + - name: Install Helm + uses: azure/setup-helm@v3 + with: + version: v3.11.1 + + - name: Package Helm chart + run: | + helm package opensource + - name: Push Helm chart to Docker Hub + run: | + helm push $(ls *.tgz) oci://registry-1.docker.io/amelieloulou From 4ae7cced9e63a25b6ab4e3d46c80e5ec1134f685 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Fri, 15 Nov 2024 16:47:49 +0100 Subject: [PATCH 030/114] fix npm cache to increase build time --- .github/workflows/ci.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2c5264a..b8f5e71 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -58,18 +58,6 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - - name: Cache npm dependencies for job - uses: actions/cache@v3 - with: - path: backup-and-clean/src/node_modules - key: ${{ runner.os }}-job-node-modules-${{ hashFiles('backup-and-clean/src/package-lock.json') }} - restore-keys: | - ${{ runner.os }}-job-node-modules- - - - name: Install npm dependencies for job - working-directory: backup-and-clean/src - run: npm install - - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 with: From ce61512bf0345d5165e297704b09a2693aed6dd3 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Fri, 15 Nov 2024 17:10:35 +0100 Subject: [PATCH 031/114] fix npm cache to increase build time --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b8f5e71..6ea9c00 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - - name: Cache npm dependencies for API + - name: Cache npm dependencies for AP uses: actions/cache@v3 with: path: src/api/node_modules From b69d2853a029d398d8060ad0c9bdc4cb57292fed Mon Sep 17 00:00:00 2001 From: Matlavv Date: Fri, 15 Nov 2024 17:21:25 +0100 Subject: [PATCH 032/114] CI optimised version --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6ea9c00..b8f5e71 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - - name: Cache npm dependencies for AP + - name: Cache npm dependencies for API uses: actions/cache@v3 with: path: src/api/node_modules From 8080b6cec4910cb1e58521ef70f4bf5aa53566d0 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Mon, 18 Nov 2024 11:38:13 +0100 Subject: [PATCH 033/114] Setup Dockerfile from node-20 to node-18 cause of deprecated version of some dependencies & add version into the CI --- .github/workflows/ci.yml | 22 +++++++++++++++++++--- src/api/Dockerfile | 6 +++--- src/api/Dockerfile.dev | 4 ++-- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b8f5e71..628eaac 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,6 +4,8 @@ on: push: branches: - workflow/api-improve + tags: + - 'v*.*.*' env: IMAGE_NAME: amelieloulou/transform-and-deliver-assets @@ -17,6 +19,9 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 + - name: Get version from tag + id: get_version + run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV - name: Cache npm dependencies for API uses: actions/cache@v3 with: @@ -41,6 +46,7 @@ jobs: key: ${{ runner.os }}-buildx-${{ github.sha }} restore-keys: | ${{ runner.os }}-buildx- + - name: Log in to Docker Hub uses: docker/login-action@v3 with: @@ -49,7 +55,7 @@ jobs: - name: Build and push Docker image API run: | - docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:latest --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache,mode=max ./src/api + docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:${{ env.VERSION }} --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache,mode=max ./src/api build-and-push-docker-job: runs-on: ubuntu-latest @@ -58,6 +64,10 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 + - name: Get version from tag + id: get_version + run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 with: @@ -70,6 +80,7 @@ jobs: key: ${{ runner.os }}-buildx-${{ github.sha }} restore-keys: | ${{ runner.os }}-buildx- + - name: Log in to Docker Hub uses: docker/login-action@v3 with: @@ -78,7 +89,7 @@ jobs: - name: Build and push Docker image Job run: | - docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:job-latest --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache,mode=max ./src + docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:job-${{ env.VERSION }} --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache,mode=max ./src publish-helm-chart: runs-on: ubuntu-latest @@ -90,6 +101,10 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 + - name: Get version from tag + id: get_version + run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 @@ -106,7 +121,8 @@ jobs: - name: Package Helm chart run: | - helm package opensource + helm package opensource --version ${{ env.VERSION }} + - name: Push Helm chart to Docker Hub run: | helm push $(ls *.tgz) oci://registry-1.docker.io/amelieloulou diff --git a/src/api/Dockerfile b/src/api/Dockerfile index 7f6d24e..b7c86f5 100644 --- a/src/api/Dockerfile +++ b/src/api/Dockerfile @@ -1,4 +1,4 @@ -FROM node:20-alpine AS builder +FROM node:18-alpine AS builder WORKDIR /app COPY package*.json ./ RUN npm set strict-ssl false && npm install @@ -7,7 +7,7 @@ RUN npm run build WORKDIR /images COPY ./images . -FROM node:20-alpine +FROM node:18-alpine WORKDIR / COPY --from=builder /app/package*.json ./ @@ -15,4 +15,4 @@ COPY --from=builder /app/node_modules ./node_modules COPY --from=builder /app/dist ./dist COPY --from=builder /app/images ./tmp/images -CMD ["node", "dist/server.js"] \ No newline at end of file +CMD ["node", "dist/server.js"] diff --git a/src/api/Dockerfile.dev b/src/api/Dockerfile.dev index c8bfafc..2485dac 100644 --- a/src/api/Dockerfile.dev +++ b/src/api/Dockerfile.dev @@ -1,4 +1,4 @@ -FROM node:20-alpine AS builder +FROM node:18-alpine AS builder WORKDIR /app COPY package*.json ./ RUN npm set strict-ssl false && npm install @@ -7,7 +7,7 @@ RUN npm run build WORKDIR /images COPY ./images . -FROM node:20-alpine +FROM node:18-alpine WORKDIR / COPY --from=builder /app/package*.json ./ From 862ef7fd97b62a474c38df183b85168d47a934ba Mon Sep 17 00:00:00 2001 From: Matlavv Date: Mon, 18 Nov 2024 11:40:24 +0100 Subject: [PATCH 034/114] add version into the CI --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 628eaac..c776bd7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,7 +5,7 @@ on: branches: - workflow/api-improve tags: - - 'v*.*.*' + - 'v0.0.2' env: IMAGE_NAME: amelieloulou/transform-and-deliver-assets From c930eb4efd3e065cb7eb8bbb3ba0d02f88fccdf2 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Mon, 18 Nov 2024 11:42:39 +0100 Subject: [PATCH 035/114] add version into the CI --- .github/workflows/ci.yml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c776bd7..5db4382 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,11 @@ jobs: - name: Get version from tag id: get_version - run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV + run: | + VERSION=${GITHUB_REF#refs/tags/} + VERSION=${VERSION//\//-} + echo "VERSION=${VERSION}" >> $GITHUB_ENV + - name: Cache npm dependencies for API uses: actions/cache@v3 with: @@ -66,7 +70,10 @@ jobs: - name: Get version from tag id: get_version - run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV + run: | + VERSION=${GITHUB_REF#refs/tags/} + VERSION=${VERSION//\//-} + echo "VERSION=${VERSION}" >> $GITHUB_ENV - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 @@ -103,7 +110,10 @@ jobs: - name: Get version from tag id: get_version - run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV + run: | + VERSION=${GITHUB_REF#refs/tags/} + VERSION=${VERSION//\//-} + echo "VERSION=${VERSION}" >> $GITHUB_ENV - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 From 4cb1da7a60a18840b2268181084b766ab8bfa1c1 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Mon, 18 Nov 2024 11:51:17 +0100 Subject: [PATCH 036/114] test optimised CI --- .github/workflows/ci.yml | 35 +++-------------------------------- 1 file changed, 3 insertions(+), 32 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5db4382..4ce93e9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,8 +4,6 @@ on: push: branches: - workflow/api-improve - tags: - - 'v0.0.2' env: IMAGE_NAME: amelieloulou/transform-and-deliver-assets @@ -19,13 +17,6 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - - name: Get version from tag - id: get_version - run: | - VERSION=${GITHUB_REF#refs/tags/} - VERSION=${VERSION//\//-} - echo "VERSION=${VERSION}" >> $GITHUB_ENV - - name: Cache npm dependencies for API uses: actions/cache@v3 with: @@ -33,7 +24,6 @@ jobs: key: ${{ runner.os }}-api-node-modules-${{ hashFiles('src/api/package-lock.json') }} restore-keys: | ${{ runner.os }}-api-node-modules- - - name: Install npm dependencies for API working-directory: src/api run: npm install @@ -50,7 +40,6 @@ jobs: key: ${{ runner.os }}-buildx-${{ github.sha }} restore-keys: | ${{ runner.os }}-buildx- - - name: Log in to Docker Hub uses: docker/login-action@v3 with: @@ -59,8 +48,7 @@ jobs: - name: Build and push Docker image API run: | - docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:${{ env.VERSION }} --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache,mode=max ./src/api - + docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:latest --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache,mode=max ./src/api build-and-push-docker-job: runs-on: ubuntu-latest @@ -68,13 +56,6 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - - name: Get version from tag - id: get_version - run: | - VERSION=${GITHUB_REF#refs/tags/} - VERSION=${VERSION//\//-} - echo "VERSION=${VERSION}" >> $GITHUB_ENV - - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 with: @@ -87,7 +68,6 @@ jobs: key: ${{ runner.os }}-buildx-${{ github.sha }} restore-keys: | ${{ runner.os }}-buildx- - - name: Log in to Docker Hub uses: docker/login-action@v3 with: @@ -96,8 +76,7 @@ jobs: - name: Build and push Docker image Job run: | - docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:job-${{ env.VERSION }} --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache,mode=max ./src - + docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:job-latest --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache,mode=max ./src publish-helm-chart: runs-on: ubuntu-latest needs: @@ -108,13 +87,6 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - - name: Get version from tag - id: get_version - run: | - VERSION=${GITHUB_REF#refs/tags/} - VERSION=${VERSION//\//-} - echo "VERSION=${VERSION}" >> $GITHUB_ENV - - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 @@ -131,8 +103,7 @@ jobs: - name: Package Helm chart run: | - helm package opensource --version ${{ env.VERSION }} - + helm package opensource - name: Push Helm chart to Docker Hub run: | helm push $(ls *.tgz) oci://registry-1.docker.io/amelieloulou From fa83f4430562606b336ade19119bc84754752292 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Mon, 18 Nov 2024 11:57:31 +0100 Subject: [PATCH 037/114] test optimised CI with cache --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4ce93e9..c2196f8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - - name: Cache npm dependencies for API + - name: Cache npm dependencies for AP uses: actions/cache@v3 with: path: src/api/node_modules From 72180a20b145f67d3a6cec653cfd6fce6195c8f3 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Mon, 18 Nov 2024 12:04:56 +0100 Subject: [PATCH 038/114] Add version in the CI --- .github/workflows/ci.yml | 55 +++++++++++++++++++++++++++++++++++----- 1 file changed, 48 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c2196f8..353b40b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,27 +3,60 @@ name: CI Docker and Helm on: push: branches: - - workflow/api-improve + - main + - '**' env: - IMAGE_NAME: amelieloulou/transform-and-deliver-assets + IMAGE_NAME_API: amelieloulou/transform-and-deliver-assets-api + IMAGE_NAME_JOB: amelieloulou/transform-and-deliver-assets-job CHART_PATH: ./opensource jobs: + determine-version: + runs-on: ubuntu-latest + outputs: + version: ${{ steps.determine-version.outputs.version }} + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Determine version + id: determine-version + run: | + if [[ "${GITHUB_REF}" == "refs/heads/main" ]]; then + # Get the latest tag + LATEST_TAG=$(git describe --tags `git rev-list --tags --max-count=1` || echo "1.0.0") + # Extract the version numbers + MAJOR=$(echo ${LATEST_TAG} | cut -d. -f1) + MINOR=$(echo ${LATEST_TAG} | cut -d. -f2) + PATCH=$(echo ${LATEST_TAG} | cut -d. -f3) + # Increment the version based on current + PATCH=$((PATCH+1)) + NEW_VERSION="$MAJOR.$MINOR.$PATCH" + echo "VERSION=${NEW_VERSION}" >> $GITHUB_ENV + echo "version=${NEW_VERSION}" >> $GITHUB_OUTPUT + else + VERSION="0.0.2-development" + echo "VERSION=${VERSION}" >> $GITHUB_ENV + echo "version=${VERSION}" >> $GITHUB_OUTPUT + fi + build-and-push-docker-api: runs-on: ubuntu-latest + needs: determine-version steps: - name: Checkout repository uses: actions/checkout@v3 - - name: Cache npm dependencies for AP + - name: Cache npm dependencies for API uses: actions/cache@v3 with: path: src/api/node_modules key: ${{ runner.os }}-api-node-modules-${{ hashFiles('src/api/package-lock.json') }} restore-keys: | ${{ runner.os }}-api-node-modules- + - name: Install npm dependencies for API working-directory: src/api run: npm install @@ -40,6 +73,7 @@ jobs: key: ${{ runner.os }}-buildx-${{ github.sha }} restore-keys: | ${{ runner.os }}-buildx- + - name: Log in to Docker Hub uses: docker/login-action@v3 with: @@ -48,9 +82,12 @@ jobs: - name: Build and push Docker image API run: | - docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:latest --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache,mode=max ./src/api + docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME_API }}:${{ needs.determine-version.outputs.version }} --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache,mode=max ./src/api + build-and-push-docker-job: runs-on: ubuntu-latest + needs: + - determine-version steps: - name: Checkout repository @@ -68,6 +105,7 @@ jobs: key: ${{ runner.os }}-buildx-${{ github.sha }} restore-keys: | ${{ runner.os }}-buildx- + - name: Log in to Docker Hub uses: docker/login-action@v3 with: @@ -76,7 +114,8 @@ jobs: - name: Build and push Docker image Job run: | - docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:job-latest --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache,mode=max ./src + docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME_JOB }}:${{ needs.determine-version.outputs.version }} --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache,mode=max ./src + publish-helm-chart: runs-on: ubuntu-latest needs: @@ -101,9 +140,11 @@ jobs: with: version: v3.11.1 - - name: Package Helm chart + - name: Update Helm chart version run: | - helm package opensource + sed -i 's/version:.*/version: ${{ needs.determine-version.outputs.version }}/' ${{ env.CHART_PATH }}/Chart.yaml + helm package ${{ env.CHART_PATH }} + - name: Push Helm chart to Docker Hub run: | helm push $(ls *.tgz) oci://registry-1.docker.io/amelieloulou From 4ddbedfe0270a3099967bc953fde07f5a59389fa Mon Sep 17 00:00:00 2001 From: Matlavv Date: Mon, 18 Nov 2024 14:38:25 +0100 Subject: [PATCH 039/114] Update Github Action cache & checkout from v3 to v4 & versionning --- .github/workflows/ci.yml | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 353b40b..6ebfd7b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,7 +4,7 @@ on: push: branches: - main - - '**' + - 'workflow/api-improve' env: IMAGE_NAME_API: amelieloulou/transform-and-deliver-assets-api @@ -18,7 +18,7 @@ jobs: version: ${{ steps.determine-version.outputs.version }} steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Determine version id: determine-version @@ -47,10 +47,10 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Cache npm dependencies for API - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: src/api/node_modules key: ${{ runner.os }}-api-node-modules-${{ hashFiles('src/api/package-lock.json') }} @@ -67,7 +67,7 @@ jobs: install: true - name: Cache Docker layers - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: /tmp/.buildx-cache key: ${{ runner.os }}-buildx-${{ github.sha }} @@ -75,7 +75,7 @@ jobs: ${{ runner.os }}-buildx- - name: Log in to Docker Hub - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} @@ -91,7 +91,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 @@ -99,7 +99,7 @@ jobs: install: true - name: Cache Docker layers - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: /tmp/.buildx-cache key: ${{ runner.os }}-buildx-${{ github.sha }} @@ -107,7 +107,7 @@ jobs: ${{ runner.os }}-buildx- - name: Log in to Docker Hub - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} @@ -124,13 +124,13 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - name: Log in to Docker Hub - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} @@ -142,7 +142,8 @@ jobs: - name: Update Helm chart version run: | - sed -i 's/version:.*/version: ${{ needs.determine-version.outputs.version }}/' ${{ env.CHART_PATH }}/Chart.yaml + VERSION="${{ needs.determine-version.outputs.version }}" + sed -i "s/^version: .*/version: ${VERSION}/" ${{ env.CHART_PATH }}/Chart.yaml helm package ${{ env.CHART_PATH }} - name: Push Helm chart to Docker Hub From 5e43e6495e2b9fa857200962091bbd71b9373576 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Mon, 18 Nov 2024 14:41:08 +0100 Subject: [PATCH 040/114] Update Github Action cache & checkout from v3 to v4 & versionning --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6ebfd7b..5911ce5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,7 +4,7 @@ on: push: branches: - main - - 'workflow/api-improve' + - workflow/api-improve env: IMAGE_NAME_API: amelieloulou/transform-and-deliver-assets-api @@ -75,7 +75,7 @@ jobs: ${{ runner.os }}-buildx- - name: Log in to Docker Hub - uses: docker/login-action@v4 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} @@ -107,7 +107,7 @@ jobs: ${{ runner.os }}-buildx- - name: Log in to Docker Hub - uses: docker/login-action@v4 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} @@ -130,7 +130,7 @@ jobs: uses: docker/setup-buildx-action@v2 - name: Log in to Docker Hub - uses: docker/login-action@v4 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} From 81f2ea0cdaa6f3bb2124578c4eeebfec7a63bd12 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Mon, 18 Nov 2024 14:55:31 +0100 Subject: [PATCH 041/114] Update Github Action cache & checkout from v3 to v4 & versionning --- .github/workflows/ci.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5911ce5..fb31c9b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -140,12 +140,9 @@ jobs: with: version: v3.11.1 - - name: Update Helm chart version + - name: Package Helm chart run: | - VERSION="${{ needs.determine-version.outputs.version }}" - sed -i "s/^version: .*/version: ${VERSION}/" ${{ env.CHART_PATH }}/Chart.yaml - helm package ${{ env.CHART_PATH }} - - - name: Push Helm chart to Docker Hub + helm package opensource + - name: Push helm chart to Docker Hub run: | helm push $(ls *.tgz) oci://registry-1.docker.io/amelieloulou From 4b97875250b80298f06f2a035283cd28704792ab Mon Sep 17 00:00:00 2001 From: Matlavv Date: Mon, 18 Nov 2024 15:12:26 +0100 Subject: [PATCH 042/114] Update Github Action versionning --- .github/workflows/ci.yml | 77 +++++++++++++++++++++++++--------------- 1 file changed, 48 insertions(+), 29 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fb31c9b..c6bab12 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,47 +3,62 @@ name: CI Docker and Helm on: push: branches: - - main - workflow/api-improve env: - IMAGE_NAME_API: amelieloulou/transform-and-deliver-assets-api - IMAGE_NAME_JOB: amelieloulou/transform-and-deliver-assets-job + IMAGE_NAME: amelieloulou/transform-and-deliver-assets CHART_PATH: ./opensource jobs: determine-version: runs-on: ubuntu-latest outputs: - version: ${{ steps.determine-version.outputs.version }} + version: ${{ steps.set_version.outputs.next_version }} + steps: - name: Checkout repository uses: actions/checkout@v4 - - name: Determine version - id: determine-version + - name: Set up Git + run: | + git config --global --add safe.directory /github/workspace + + - name: Get the current version + id: get_version run: | - if [[ "${GITHUB_REF}" == "refs/heads/main" ]]; then - # Get the latest tag - LATEST_TAG=$(git describe --tags `git rev-list --tags --max-count=1` || echo "1.0.0") - # Extract the version numbers - MAJOR=$(echo ${LATEST_TAG} | cut -d. -f1) - MINOR=$(echo ${LATEST_TAG} | cut -d. -f2) - PATCH=$(echo ${LATEST_TAG} | cut -d. -f3) - # Increment the version based on current - PATCH=$((PATCH+1)) - NEW_VERSION="$MAJOR.$MINOR.$PATCH" - echo "VERSION=${NEW_VERSION}" >> $GITHUB_ENV - echo "version=${NEW_VERSION}" >> $GITHUB_OUTPUT - else - VERSION="0.0.2-development" - echo "VERSION=${VERSION}" >> $GITHUB_ENV - echo "version=${VERSION}" >> $GITHUB_OUTPUT + current_version="0.0.0" + if git rev-list --tags --max-count=1; then + current_version=$(git describe --tags $(git rev-list --tags --max-count=1)) fi + echo "current_version=$current_version" >> $GITHUB_ENV + echo "Current version: $current_version" + + - name: Prepare the next version + id: set_version + run: | + current_version=${{ env.current_version }} + IFS='.' read -a version_parts <<< "$current_version" + major=${version_parts[0]} + minor=${version_parts[1]} + patch=${version_parts[2]} + patch=$((patch + 1)) + next_version="$major.$minor.$patch" + echo "::set-output name=next_version::$next_version" + env: + current_version: ${{ env.current_version }} + + - name: Set the next tag + run: | + next_version=${{ steps.set_version.outputs.next_version }} + echo "Creating new tag: $next_version" + git tag $next_version + git push origin $next_version build-and-push-docker-api: runs-on: ubuntu-latest needs: determine-version + env: + IMAGE_VERSION: ${{ needs.determine-version.outputs.version }} steps: - name: Checkout repository @@ -82,12 +97,13 @@ jobs: - name: Build and push Docker image API run: | - docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME_API }}:${{ needs.determine-version.outputs.version }} --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache,mode=max ./src/api + docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:api-${{ env.IMAGE_VERSION }} --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache,mode=max ./src/api build-and-push-docker-job: runs-on: ubuntu-latest - needs: - - determine-version + needs: determine-version + env: + IMAGE_VERSION: ${{ needs.determine-version.outputs.version }} steps: - name: Checkout repository @@ -114,13 +130,15 @@ jobs: - name: Build and push Docker image Job run: | - docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME_JOB }}:${{ needs.determine-version.outputs.version }} --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache,mode=max ./src + docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:job-${{ env.IMAGE_VERSION }} --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache,mode=max ./src publish-helm-chart: runs-on: ubuntu-latest needs: - build-and-push-docker-api - build-and-push-docker-job + env: + IMAGE_VERSION: ${{ needs.determine-version.outputs.version }} steps: - name: Checkout repository @@ -142,7 +160,8 @@ jobs: - name: Package Helm chart run: | - helm package opensource - - name: Push helm chart to Docker Hub + helm package ${{ env.CHART_PATH }} + + - name: Push Helm chart to Docker Hub run: | - helm push $(ls *.tgz) oci://registry-1.docker.io/amelieloulou + helm push $(ls *.tgz) oci://registry-1.docker.io/amelieloulou --version ${{ env.IMAGE_VERSION }} From 367a3bc6137cd6e57e118cbb0fbfb23e393a38c2 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Mon, 18 Nov 2024 15:16:12 +0100 Subject: [PATCH 043/114] Update Github Action versionning --- .github/workflows/ci.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c6bab12..124657a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,8 +27,10 @@ jobs: id: get_version run: | current_version="0.0.0" - if git rev-list --tags --max-count=1; then - current_version=$(git describe --tags $(git rev-list --tags --max-count=1)) + if [ $(git tag -l | wc -l) -ne 0 ]; then + latest_tag=$(git describe --tags $(git rev-list --tags --max-count=1)) + echo "Found latest tag: $latest_tag" + current_version=$latest_tag fi echo "current_version=$current_version" >> $GITHUB_ENV echo "Current version: $current_version" @@ -38,9 +40,9 @@ jobs: run: | current_version=${{ env.current_version }} IFS='.' read -a version_parts <<< "$current_version" - major=${version_parts[0]} - minor=${version_parts[1]} - patch=${version_parts[2]} + major=${version_parts[0]:-0} + minor=${version_parts[1]:-0} + patch=${version_parts[2]:-0} patch=$((patch + 1)) next_version="$major.$minor.$patch" echo "::set-output name=next_version::$next_version" From 907439afcea26201ae1385e19592c6b22ba3283c Mon Sep 17 00:00:00 2001 From: Matlavv Date: Mon, 18 Nov 2024 15:26:49 +0100 Subject: [PATCH 044/114] Fix helm chart no version update --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 124657a..14f82a7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -166,4 +166,4 @@ jobs: - name: Push Helm chart to Docker Hub run: | - helm push $(ls *.tgz) oci://registry-1.docker.io/amelieloulou --version ${{ env.IMAGE_VERSION }} + helm push $(ls *.tgz) oci://registry-1.docker.io/amelieloulou ${{ env.IMAGE_VERSION }} From 2331db135686a9e985d87fd8c59cc12911170a60 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Mon, 18 Nov 2024 15:30:48 +0100 Subject: [PATCH 045/114] Try to update version with commit message --- .github/workflows/ci.yml | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 14f82a7..458d555 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,20 +39,35 @@ jobs: id: set_version run: | current_version=${{ env.current_version }} - IFS='.' read -a version_parts <<< "$current_version" - major=${version_parts[0]:-0} - minor=${version_parts[1]:-0} - patch=${version_parts[2]:-0} - patch=$((patch + 1)) + read_major_minor_patch() { + IFS='.' read -a version_parts <<< "$1" + echo "${version_parts[0]:-0} ${version_parts[1]:-0} ${version_parts[2]:-0}" + } + + commit_message=$(git log -1 --pretty=%B) + read major minor patch < <(read_major_minor_patch "$current_version") + + if [[ $commit_message =~ major ]]; then + major=$((major + 1)) + minor=0 + patch=0 + elif [[ $commit_message =~ minor ]]; then + minor=$((minor + 1)) + patch=0 + else + patch=$((patch + 1)) + fi + next_version="$major.$minor.$patch" - echo "::set-output name=next_version::$next_version" + echo "next_version=$next_version" >> $GITHUB_ENV + echo "Creating new tag: $next_version" + echo "next_version=$next_version" env: current_version: ${{ env.current_version }} - name: Set the next tag run: | next_version=${{ steps.set_version.outputs.next_version }} - echo "Creating new tag: $next_version" git tag $next_version git push origin $next_version @@ -166,4 +181,4 @@ jobs: - name: Push Helm chart to Docker Hub run: | - helm push $(ls *.tgz) oci://registry-1.docker.io/amelieloulou ${{ env.IMAGE_VERSION }} + helm push $(ls *.tgz) oci://registry-1.docker.io/${{ env.IMAGE_NAME }}-helm:${{ env.IMAGE_VERSION }} From 482ab911b46ec9e87e5f8b287a005ae1b14dd443 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Mon, 18 Nov 2024 15:47:21 +0100 Subject: [PATCH 046/114] Try to update version with commit message --- .github/workflows/ci.yml | 92 ++++++++++++++-------------------------- 1 file changed, 33 insertions(+), 59 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 458d555..27b0b1f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,76 +13,54 @@ jobs: determine-version: runs-on: ubuntu-latest outputs: - version: ${{ steps.set_version.outputs.next_version }} + new_version: ${{ steps.set_output.outputs.new_version }} steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v3 - - name: Set up Git - run: | - git config --global --add safe.directory /github/workspace + - name: Get the latest tag + id: get_latest_tag + run: echo "::set-output name=tag::$(git describe --tags --abbrev=0)" - - name: Get the current version - id: get_version + - name: Determine next version + id: set_output run: | - current_version="0.0.0" - if [ $(git tag -l | wc -l) -ne 0 ]; then - latest_tag=$(git describe --tags $(git rev-list --tags --max-count=1)) - echo "Found latest tag: $latest_tag" - current_version=$latest_tag - fi - echo "current_version=$current_version" >> $GITHUB_ENV - echo "Current version: $current_version" - - - name: Prepare the next version - id: set_version - run: | - current_version=${{ env.current_version }} - read_major_minor_patch() { - IFS='.' read -a version_parts <<< "$1" - echo "${version_parts[0]:-0} ${version_parts[1]:-0} ${version_parts[2]:-0}" - } - - commit_message=$(git log -1 --pretty=%B) - read major minor patch < <(read_major_minor_patch "$current_version") - - if [[ $commit_message =~ major ]]; then + latest_tag=${{ steps.get_latest_tag.outputs.tag }} + echo "Latest tag: $latest_tag" + + # Extract the major, minor, and patch numbers from the tag + IFS='.' read -r -a version_parts <<< "${latest_tag#v}" + major=${version_parts[0]} + minor=${version_parts[1]} + patch=${version_parts[2]} + + # Determine the type of version bump + if [[ ${{ github.event.head_commit.message }} == *"major"* ]]; then major=$((major + 1)) minor=0 patch=0 - elif [[ $commit_message =~ minor ]]; then + elif [[ ${{ github.event.head_commit.message }} == *"minor"* ]]; then minor=$((minor + 1)) patch=0 else patch=$((patch + 1)) fi - - next_version="$major.$minor.$patch" - echo "next_version=$next_version" >> $GITHUB_ENV - echo "Creating new tag: $next_version" - echo "next_version=$next_version" - env: - current_version: ${{ env.current_version }} - - - name: Set the next tag - run: | - next_version=${{ steps.set_version.outputs.next_version }} - git tag $next_version - git push origin $next_version + + new_version="v$major.$minor.$patch" + echo "New version: $new_version" + echo "::set-output name=new_version::$new_version" build-and-push-docker-api: runs-on: ubuntu-latest needs: determine-version - env: - IMAGE_VERSION: ${{ needs.determine-version.outputs.version }} steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v3 - name: Cache npm dependencies for API - uses: actions/cache@v4 + uses: actions/cache@v3 with: path: src/api/node_modules key: ${{ runner.os }}-api-node-modules-${{ hashFiles('src/api/package-lock.json') }} @@ -99,7 +77,7 @@ jobs: install: true - name: Cache Docker layers - uses: actions/cache@v4 + uses: actions/cache@v3 with: path: /tmp/.buildx-cache key: ${{ runner.os }}-buildx-${{ github.sha }} @@ -114,17 +92,15 @@ jobs: - name: Build and push Docker image API run: | - docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:api-${{ env.IMAGE_VERSION }} --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache,mode=max ./src/api + docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:api-${{ needs.determine-version.outputs.new_version }} --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache,mode=max ./src/api build-and-push-docker-job: runs-on: ubuntu-latest needs: determine-version - env: - IMAGE_VERSION: ${{ needs.determine-version.outputs.version }} steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v3 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 @@ -132,7 +108,7 @@ jobs: install: true - name: Cache Docker layers - uses: actions/cache@v4 + uses: actions/cache@v3 with: path: /tmp/.buildx-cache key: ${{ runner.os }}-buildx-${{ github.sha }} @@ -147,19 +123,17 @@ jobs: - name: Build and push Docker image Job run: | - docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:job-${{ env.IMAGE_VERSION }} --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache,mode=max ./src + docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:job-${{ needs.determine-version.outputs.new_version }} --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache,mode=max ./src publish-helm-chart: runs-on: ubuntu-latest needs: - build-and-push-docker-api - build-and-push-docker-job - env: - IMAGE_VERSION: ${{ needs.determine-version.outputs.version }} steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v3 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 @@ -177,8 +151,8 @@ jobs: - name: Package Helm chart run: | - helm package ${{ env.CHART_PATH }} + helm package opensource - name: Push Helm chart to Docker Hub run: | - helm push $(ls *.tgz) oci://registry-1.docker.io/${{ env.IMAGE_NAME }}-helm:${{ env.IMAGE_VERSION }} + helm push $(ls *.tgz) oci://registry-1.docker.io/amelieloulou From 844560ceefe2e7fcb1bfc6f5f6309f12c51a77bc Mon Sep 17 00:00:00 2001 From: Matlavv Date: Mon, 18 Nov 2024 15:48:47 +0100 Subject: [PATCH 047/114] Try to update version with commit message --- .github/workflows/ci.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 27b0b1f..16c6997 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,11 @@ jobs: - name: Get the latest tag id: get_latest_tag - run: echo "::set-output name=tag::$(git describe --tags --abbrev=0)" + run: | + git fetch --tags + latest_tag=$(git describe --tags --abbrev=0 2>/dev/null || echo "v0.0.0") + echo "Latest tag: $latest_tag" + echo "::set-output name=tag::$latest_tag" - name: Determine next version id: set_output @@ -36,11 +40,11 @@ jobs: patch=${version_parts[2]} # Determine the type of version bump - if [[ ${{ github.event.head_commit.message }} == *"major"* ]]; then + if [[ "${{ github.event.head_commit.message }}" == *"major"* ]]; then major=$((major + 1)) minor=0 patch=0 - elif [[ ${{ github.event.head_commit.message }} == *"minor"* ]]; then + elif [[ "${{ github.event.head_commit.message }}" == *"minor"* ]]; then minor=$((minor + 1)) patch=0 else From d6d8c4caa64e85c6a8dc05a7a8c2849146b3a62f Mon Sep 17 00:00:00 2001 From: Matlavv Date: Mon, 18 Nov 2024 15:58:59 +0100 Subject: [PATCH 048/114] Try to update version with commit message --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 16c6997..6be9d46 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,21 +25,20 @@ jobs: git fetch --tags latest_tag=$(git describe --tags --abbrev=0 2>/dev/null || echo "v0.0.0") echo "Latest tag: $latest_tag" - echo "::set-output name=tag::$latest_tag" + echo "tag=$latest_tag" >> $GITHUB_ENV - name: Determine next version id: set_output run: | - latest_tag=${{ steps.get_latest_tag.outputs.tag }} + latest_tag=${{ env.tag }} echo "Latest tag: $latest_tag" - # Extract the major, minor, and patch numbers from the tag IFS='.' read -r -a version_parts <<< "${latest_tag#v}" major=${version_parts[0]} minor=${version_parts[1]} patch=${version_parts[2]} - # Determine the type of version bump + # If the commit message contains "major" or "minor", increment the corresponding version part if [[ "${{ github.event.head_commit.message }}" == *"major"* ]]; then major=$((major + 1)) minor=0 @@ -53,7 +52,8 @@ jobs: new_version="v$major.$minor.$patch" echo "New version: $new_version" - echo "::set-output name=new_version::$new_version" + echo "new_version=$new_version" >> $GITHUB_ENV + echo "new_version=$new_version" >> $GITHUB_OUTPUT build-and-push-docker-api: runs-on: ubuntu-latest From 21b35910d4fa146049573c450fa3241514c7d631 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Mon, 18 Nov 2024 16:02:42 +0100 Subject: [PATCH 049/114] Try to update version with commit message --- .github/workflows/ci.yml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6be9d46..acc1895 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: id: get_latest_tag run: | git fetch --tags - latest_tag=$(git describe --tags --abbrev=0 2>/dev/null || echo "v0.0.0") + latest_tag=$(git describe --tags --abbrev=0 2>/dev/null || echo "0.0.0") echo "Latest tag: $latest_tag" echo "tag=$latest_tag" >> $GITHUB_ENV @@ -33,12 +33,13 @@ jobs: latest_tag=${{ env.tag }} echo "Latest tag: $latest_tag" - IFS='.' read -r -a version_parts <<< "${latest_tag#v}" + # Extract the major, minor, and patch numbers from the tag + IFS='.' read -r -a version_parts <<< "$latest_tag" major=${version_parts[0]} minor=${version_parts[1]} patch=${version_parts[2]} - # If the commit message contains "major" or "minor", increment the corresponding version part + # Determine the type of version bump if [[ "${{ github.event.head_commit.message }}" == *"major"* ]]; then major=$((major + 1)) minor=0 @@ -50,11 +51,18 @@ jobs: patch=$((patch + 1)) fi - new_version="v$major.$minor.$patch" + new_version="$major.$minor.$patch" echo "New version: $new_version" echo "new_version=$new_version" >> $GITHUB_ENV echo "new_version=$new_version" >> $GITHUB_OUTPUT + - name: Update tag in the repository + run: | + git config --global user.name 'github-actions' + git config --global user.email 'github-actions@github.com' + git tag ${{ steps.set_output.outputs.new_version }} + git push origin ${{ steps.set_output.outputs.new_version }} + build-and-push-docker-api: runs-on: ubuntu-latest needs: determine-version From 2780a814996b7a417c5de6aff8eade222f9301e6 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Mon, 18 Nov 2024 16:05:33 +0100 Subject: [PATCH 050/114] Try to update version with commit message --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index acc1895..488f079 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,7 @@ jobs: run: | latest_tag=${{ env.tag }} echo "Latest tag: $latest_tag" - + # Extract the major, minor, and patch numbers from the tag IFS='.' read -r -a version_parts <<< "$latest_tag" major=${version_parts[0]} @@ -50,13 +50,13 @@ jobs: else patch=$((patch + 1)) fi - + new_version="$major.$minor.$patch" echo "New version: $new_version" echo "new_version=$new_version" >> $GITHUB_ENV echo "new_version=$new_version" >> $GITHUB_OUTPUT - - name: Update tag in the repository + - name: Create and push new tag run: | git config --global user.name 'github-actions' git config --global user.email 'github-actions@github.com' From e091530e21e189022c47224cc8801f046b765314 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Mon, 18 Nov 2024 16:06:10 +0100 Subject: [PATCH 051/114] Try to update version with commit message --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 488f079..ec03ae5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: id: get_latest_tag run: | git fetch --tags - latest_tag=$(git describe --tags --abbrev=0 2>/dev/null || echo "0.0.0") + latest_tag=$(git describe --tags --abbrev=0 2>/dev/null || echo "0.0.1") echo "Latest tag: $latest_tag" echo "tag=$latest_tag" >> $GITHUB_ENV From 85c6628e2439dff53542213bcb5b9cf7c18e55fe Mon Sep 17 00:00:00 2001 From: Matlavv Date: Mon, 18 Nov 2024 16:09:53 +0100 Subject: [PATCH 052/114] Try to update version with commit message --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ec03ae5..bed283f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: new_version: ${{ steps.set_output.outputs.new_version }} steps: - - name: Checkout repository + - name: Checkout repositor uses: actions/checkout@v3 - name: Get the latest tag From 16ae90632f9bc900396b658a8900706cd82cf181 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Mon, 18 Nov 2024 16:11:28 +0100 Subject: [PATCH 053/114] Try to update version with commit message minor --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bed283f..ec03ae5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: new_version: ${{ steps.set_output.outputs.new_version }} steps: - - name: Checkout repositor + - name: Checkout repository uses: actions/checkout@v3 - name: Get the latest tag From 2d61b16ae9a7d6879db948c5e2293c5d8fc704be Mon Sep 17 00:00:00 2001 From: Matlavv Date: Mon, 18 Nov 2024 16:12:48 +0100 Subject: [PATCH 054/114] Try to update version with commit message --- .github/workflows/ci.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ec03ae5..9412ec4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,6 +52,13 @@ jobs: fi new_version="$major.$minor.$patch" + + # Check if the new version tag already exists + while git rev-parse "refs/tags/$new_version" >/dev/null 2>&1; do + patch=$((patch + 1)) + new_version="$major.$minor.$patch" + done + echo "New version: $new_version" echo "new_version=$new_version" >> $GITHUB_ENV echo "new_version=$new_version" >> $GITHUB_OUTPUT From cba8950f435eeea3a61d817c0b057b95717a36c4 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Mon, 18 Nov 2024 16:13:35 +0100 Subject: [PATCH 055/114] Try to update version with commit message --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9412ec4..1acebd5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: new_version: ${{ steps.set_output.outputs.new_version }} steps: - - name: Checkout repository + - name: Checkout repositor uses: actions/checkout@v3 - name: Get the latest tag From bafce0a93807a9cd75ebd195ea8814e6388b7e2e Mon Sep 17 00:00:00 2001 From: Matlavv Date: Mon, 18 Nov 2024 16:21:41 +0100 Subject: [PATCH 056/114] Try to update minor version with commit message --- .github/workflows/ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1acebd5..78d26df 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: new_version: ${{ steps.set_output.outputs.new_version }} steps: - - name: Checkout repositor + - name: Checkout repository uses: actions/checkout@v3 - name: Get the latest tag @@ -63,6 +63,10 @@ jobs: echo "new_version=$new_version" >> $GITHUB_ENV echo "new_version=$new_version" >> $GITHUB_OUTPUT + - name: Update Helm chart version + run: | + sed -i "s/version:.*/version: ${{ steps.set_output.outputs.new_version }}/" ${{ env.CHART_PATH }}/Chart.yaml + - name: Create and push new tag run: | git config --global user.name 'github-actions' From 374725b5084aaca926bb04d875c6633b7e37e434 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Mon, 18 Nov 2024 16:28:26 +0100 Subject: [PATCH 057/114] Improve Docker & NPM cache settings & try to update helm version --- .github/workflows/ci.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 78d26df..20e0abd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,13 +33,11 @@ jobs: latest_tag=${{ env.tag }} echo "Latest tag: $latest_tag" - # Extract the major, minor, and patch numbers from the tag IFS='.' read -r -a version_parts <<< "$latest_tag" major=${version_parts[0]} minor=${version_parts[1]} patch=${version_parts[2]} - # Determine the type of version bump if [[ "${{ github.event.head_commit.message }}" == *"major"* ]]; then major=$((major + 1)) minor=0 @@ -53,7 +51,6 @@ jobs: new_version="$major.$minor.$patch" - # Check if the new version tag already exists while git rev-parse "refs/tags/$new_version" >/dev/null 2>&1; do patch=$((patch + 1)) new_version="$major.$minor.$patch" @@ -103,9 +100,9 @@ jobs: uses: actions/cache@v3 with: path: /tmp/.buildx-cache - key: ${{ runner.os }}-buildx-${{ github.sha }} + key: ${{ runner.os }}-buildx-${{ hashFiles('src/api/Dockerfile', 'src/api/.dockerignore') }}-${{ github.sha }} restore-keys: | - ${{ runner.os }}-buildx- + ${{ runner.os }}-buildx-${{ hashFiles('src/api/Dockerfile', 'src/api/.dockerignore') }}- - name: Log in to Docker Hub uses: docker/login-action@v3 @@ -134,9 +131,9 @@ jobs: uses: actions/cache@v3 with: path: /tmp/.buildx-cache - key: ${{ runner.os }}-buildx-${{ github.sha }} + key: ${{ runner.os }}-buildx-${{ hashFiles('src/Dockerfile', 'src/.dockerignore') }}-${{ github.sha }} restore-keys: | - ${{ runner.os }}-buildx- + ${{ runner.os }}-buildx-${{ hashFiles('src/Dockerfile', 'src/.dockerignore') }}- - name: Log in to Docker Hub uses: docker/login-action@v3 From bf3c4b57bdb6fa24e0ce50a956b36d79c89280fc Mon Sep 17 00:00:00 2001 From: Matlavv Date: Mon, 18 Nov 2024 16:40:25 +0100 Subject: [PATCH 058/114] Try to fix version not incrementing well --- .github/workflows/ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 20e0abd..466c0e2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,10 @@ jobs: id: get_latest_tag run: | git fetch --tags - latest_tag=$(git describe --tags --abbrev=0 2>/dev/null || echo "0.0.1") + latest_tag=$(git tag -l --sort=-v:refname | head -n 1) + if [ -z "$latest_tag" ]; then + latest_tag="0.0.0" + fi echo "Latest tag: $latest_tag" echo "tag=$latest_tag" >> $GITHUB_ENV From 8359603b016d0e596a0df8c1fccebe2697a5976b Mon Sep 17 00:00:00 2001 From: Matlavv Date: Mon, 18 Nov 2024 16:41:35 +0100 Subject: [PATCH 059/114] Testing version incrementing minor --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 466c0e2..be912f4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - - name: Get the latest tag + - name: Get the latest ta id: get_latest_tag run: | git fetch --tags From 9ce7c1a765aa9cf5d78ffcc250fa83a6719eea62 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Mon, 18 Nov 2024 16:42:45 +0100 Subject: [PATCH 060/114] Testing version incrementing with differents levels --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index be912f4..466c0e2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - - name: Get the latest ta + - name: Get the latest tag id: get_latest_tag run: | git fetch --tags From f2dd98e6835860bf622d965a91415ad661cf31b7 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Mon, 18 Nov 2024 16:50:29 +0100 Subject: [PATCH 061/114] Testing version incrementing with differents levels major --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 466c0e2..be912f4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - - name: Get the latest tag + - name: Get the latest ta id: get_latest_tag run: | git fetch --tags From 3120aed1738ee0255e1ff2f6ae33d68d5599343e Mon Sep 17 00:00:00 2001 From: Matlavv Date: Mon, 18 Nov 2024 16:56:38 +0100 Subject: [PATCH 062/114] Testing version incrementing with differents levels --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index be912f4..466c0e2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - - name: Get the latest ta + - name: Get the latest tag id: get_latest_tag run: | git fetch --tags From 5a57ef0de5c37e52b03910524785a4e9311f981e Mon Sep 17 00:00:00 2001 From: Matlavv Date: Tue, 19 Nov 2024 10:05:56 +0100 Subject: [PATCH 063/114] Testing cache optimisation with Docker --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 466c0e2..62800ca 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: new_version: ${{ steps.set_output.outputs.new_version }} steps: - - name: Checkout repository + - name: Checkout repositor uses: actions/checkout@v3 - name: Get the latest tag From 89389ae92f50e4965e0ba54ce615b9f69db19ac8 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Tue, 19 Nov 2024 10:30:16 +0100 Subject: [PATCH 064/114] Testing cache optimisation with Docker --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 62800ca..466c0e2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: new_version: ${{ steps.set_output.outputs.new_version }} steps: - - name: Checkout repositor + - name: Checkout repository uses: actions/checkout@v3 - name: Get the latest tag From d2f290f5afe8a4090e09798f4665b9651eb11c4f Mon Sep 17 00:00:00 2001 From: Matlavv Date: Tue, 19 Nov 2024 14:02:33 +0100 Subject: [PATCH 065/114] Check helm versionning --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 466c0e2..4048f38 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -178,4 +178,4 @@ jobs: - name: Push Helm chart to Docker Hub run: | - helm push $(ls *.tgz) oci://registry-1.docker.io/amelieloulou + helm push $(ls *.tgz) oci://registry-1.docker.io/amelieloulou-${{ needs.determine-version.outputs.new_version }} From 24bf076724e8445277577714fcbfb93c9bef706b Mon Sep 17 00:00:00 2001 From: Matlavv Date: Tue, 19 Nov 2024 14:23:12 +0100 Subject: [PATCH 066/114] Try to update helm versionning --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4048f38..312143a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -65,7 +65,7 @@ jobs: - name: Update Helm chart version run: | - sed -i "s/version:.*/version: ${{ steps.set_output.outputs.new_version }}/" ${{ env.CHART_PATH }}/Chart.yaml + sed -i "s/^version:.*/version: ${{ steps.set_output.outputs.new_version }}/" ${{ env.CHART_PATH }}/Chart.yaml - name: Create and push new tag run: | @@ -178,4 +178,4 @@ jobs: - name: Push Helm chart to Docker Hub run: | - helm push $(ls *.tgz) oci://registry-1.docker.io/amelieloulou-${{ needs.determine-version.outputs.new_version }} + helm push $(ls *.tgz) oci://registry-1.docker.io/amelieloulou From 69ac4cf41097d3a0547fb1e99822dc894c6b98a5 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Tue, 19 Nov 2024 14:34:57 +0100 Subject: [PATCH 067/114] Try to update helm versionning --- .github/workflows/ci.yml | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 312143a..733afb7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,18 +29,15 @@ jobs: fi echo "Latest tag: $latest_tag" echo "tag=$latest_tag" >> $GITHUB_ENV - - name: Determine next version id: set_output run: | latest_tag=${{ env.tag }} echo "Latest tag: $latest_tag" - IFS='.' read -r -a version_parts <<< "$latest_tag" major=${version_parts[0]} minor=${version_parts[1]} patch=${version_parts[2]} - if [[ "${{ github.event.head_commit.message }}" == *"major"* ]]; then major=$((major + 1)) minor=0 @@ -51,29 +48,23 @@ jobs: else patch=$((patch + 1)) fi - new_version="$major.$minor.$patch" - while git rev-parse "refs/tags/$new_version" >/dev/null 2>&1; do patch=$((patch + 1)) new_version="$major.$minor.$patch" done - echo "New version: $new_version" echo "new_version=$new_version" >> $GITHUB_ENV echo "new_version=$new_version" >> $GITHUB_OUTPUT - - name: Update Helm chart version run: | - sed -i "s/^version:.*/version: ${{ steps.set_output.outputs.new_version }}/" ${{ env.CHART_PATH }}/Chart.yaml - + sed -i "s/version:.*/version: ${{ steps.set_output.outputs.new_version }}/" ${{ env.CHART_PATH }}/Chart.yaml - name: Create and push new tag run: | git config --global user.name 'github-actions' git config --global user.email 'github-actions@github.com' git tag ${{ steps.set_output.outputs.new_version }} git push origin ${{ steps.set_output.outputs.new_version }} - build-and-push-docker-api: runs-on: ubuntu-latest needs: determine-version @@ -89,7 +80,6 @@ jobs: key: ${{ runner.os }}-api-node-modules-${{ hashFiles('src/api/package-lock.json') }} restore-keys: | ${{ runner.os }}-api-node-modules- - - name: Install npm dependencies for API working-directory: src/api run: npm install @@ -106,7 +96,6 @@ jobs: key: ${{ runner.os }}-buildx-${{ hashFiles('src/api/Dockerfile', 'src/api/.dockerignore') }}-${{ github.sha }} restore-keys: | ${{ runner.os }}-buildx-${{ hashFiles('src/api/Dockerfile', 'src/api/.dockerignore') }}- - - name: Log in to Docker Hub uses: docker/login-action@v3 with: @@ -116,7 +105,6 @@ jobs: - name: Build and push Docker image API run: | docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:api-${{ needs.determine-version.outputs.new_version }} --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache,mode=max ./src/api - build-and-push-docker-job: runs-on: ubuntu-latest needs: determine-version @@ -137,7 +125,6 @@ jobs: key: ${{ runner.os }}-buildx-${{ hashFiles('src/Dockerfile', 'src/.dockerignore') }}-${{ github.sha }} restore-keys: | ${{ runner.os }}-buildx-${{ hashFiles('src/Dockerfile', 'src/.dockerignore') }}- - - name: Log in to Docker Hub uses: docker/login-action@v3 with: @@ -147,7 +134,6 @@ jobs: - name: Build and push Docker image Job run: | docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:job-${{ needs.determine-version.outputs.new_version }} --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache,mode=max ./src - publish-helm-chart: runs-on: ubuntu-latest needs: @@ -175,7 +161,6 @@ jobs: - name: Package Helm chart run: | helm package opensource - - name: Push Helm chart to Docker Hub run: | helm push $(ls *.tgz) oci://registry-1.docker.io/amelieloulou From 52a4337703c1e9aaefcf6cd9805557cb6fec1248 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Tue, 19 Nov 2024 14:39:28 +0100 Subject: [PATCH 068/114] Try to update helm versionning --- .github/workflows/ci.yml | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 733afb7..cd248f6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,6 +29,7 @@ jobs: fi echo "Latest tag: $latest_tag" echo "tag=$latest_tag" >> $GITHUB_ENV + - name: Determine next version id: set_output run: | @@ -56,15 +57,25 @@ jobs: echo "New version: $new_version" echo "new_version=$new_version" >> $GITHUB_ENV echo "new_version=$new_version" >> $GITHUB_OUTPUT + - name: Update Helm chart version run: | - sed -i "s/version:.*/version: ${{ steps.set_output.outputs.new_version }}/" ${{ env.CHART_PATH }}/Chart.yaml - - name: Create and push new tag + sed -i "s/^version:.*/version: ${{ steps.set_output.outputs.new_version }}/" ${{ env.CHART_PATH }}/Chart.yaml + sed -i "s/^appVersion:.*/appVersion: '${{ steps.set_output.outputs.new_version }}'/" ${{ env.CHART_PATH }}/Chart.yaml + + - name: Commit updated Helm chart version run: | git config --global user.name 'github-actions' git config --global user.email 'github-actions@github.com' + git add ${{ env.CHART_PATH }}/Chart.yaml + git commit -m "Update Helm chart version to ${{ steps.set_output.outputs.new_version }}" + git push origin HEAD:${{ github.head_ref }} # Push changes to the current branch + + - name: Create and push new tag + run: | git tag ${{ steps.set_output.outputs.new_version }} git push origin ${{ steps.set_output.outputs.new_version }} + build-and-push-docker-api: runs-on: ubuntu-latest needs: determine-version @@ -80,6 +91,7 @@ jobs: key: ${{ runner.os }}-api-node-modules-${{ hashFiles('src/api/package-lock.json') }} restore-keys: | ${{ runner.os }}-api-node-modules- + - name: Install npm dependencies for API working-directory: src/api run: npm install @@ -96,6 +108,7 @@ jobs: key: ${{ runner.os }}-buildx-${{ hashFiles('src/api/Dockerfile', 'src/api/.dockerignore') }}-${{ github.sha }} restore-keys: | ${{ runner.os }}-buildx-${{ hashFiles('src/api/Dockerfile', 'src/api/.dockerignore') }}- + - name: Log in to Docker Hub uses: docker/login-action@v3 with: @@ -105,6 +118,7 @@ jobs: - name: Build and push Docker image API run: | docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:api-${{ needs.determine-version.outputs.new_version }} --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache,mode=max ./src/api + build-and-push-docker-job: runs-on: ubuntu-latest needs: determine-version @@ -125,6 +139,7 @@ jobs: key: ${{ runner.os }}-buildx-${{ hashFiles('src/Dockerfile', 'src/.dockerignore') }}-${{ github.sha }} restore-keys: | ${{ runner.os }}-buildx-${{ hashFiles('src/Dockerfile', 'src/.dockerignore') }}- + - name: Log in to Docker Hub uses: docker/login-action@v3 with: @@ -134,6 +149,7 @@ jobs: - name: Build and push Docker image Job run: | docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:job-${{ needs.determine-version.outputs.new_version }} --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache,mode=max ./src + publish-helm-chart: runs-on: ubuntu-latest needs: @@ -160,7 +176,8 @@ jobs: - name: Package Helm chart run: | - helm package opensource + helm package ${{ env.CHART_PATH }} + - name: Push Helm chart to Docker Hub run: | helm push $(ls *.tgz) oci://registry-1.docker.io/amelieloulou From 394265dbe5b2bd0b8a267b4a05dbe64e5a7ea4b4 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Tue, 19 Nov 2024 14:47:16 +0100 Subject: [PATCH 069/114] Try to update helm versionning --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cd248f6..7aac772 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,7 +69,8 @@ jobs: git config --global user.email 'github-actions@github.com' git add ${{ env.CHART_PATH }}/Chart.yaml git commit -m "Update Helm chart version to ${{ steps.set_output.outputs.new_version }}" - git push origin HEAD:${{ github.head_ref }} # Push changes to the current branch + current_branch=$(git rev-parse --abbrev-ref HEAD) + git push origin $current_branch # Push changes to the current branch - name: Create and push new tag run: | From e0486f649b50fa677cef38bb0f32ef64f81bbd02 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 19 Nov 2024 13:47:31 +0000 Subject: [PATCH 070/114] Update Helm chart version to 1.0.7 --- opensource/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/opensource/Chart.yaml b/opensource/Chart.yaml index 2504ef7..7cae920 100644 --- a/opensource/Chart.yaml +++ b/opensource/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: transform-and-deliver-assets description: TADA 🎉 - Transform And Deliver Assets - Bouygues Telecom type: application -version: 0.0.2-beta -appVersion: '0.0.1' \ No newline at end of file +version: 1.0.7 +appVersion: '1.0.7' \ No newline at end of file From ad87788506bd199e5412a2c12a63d916eb30845f Mon Sep 17 00:00:00 2001 From: Matlavv Date: Tue, 19 Nov 2024 15:23:38 +0100 Subject: [PATCH 071/114] Test to update helm chart version --- .github/workflows/ci.yml | 24 +++--------------------- opensource/Chart.yaml | 4 ++-- 2 files changed, 5 insertions(+), 23 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7aac772..733afb7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,6 @@ jobs: fi echo "Latest tag: $latest_tag" echo "tag=$latest_tag" >> $GITHUB_ENV - - name: Determine next version id: set_output run: | @@ -57,26 +56,15 @@ jobs: echo "New version: $new_version" echo "new_version=$new_version" >> $GITHUB_ENV echo "new_version=$new_version" >> $GITHUB_OUTPUT - - name: Update Helm chart version run: | - sed -i "s/^version:.*/version: ${{ steps.set_output.outputs.new_version }}/" ${{ env.CHART_PATH }}/Chart.yaml - sed -i "s/^appVersion:.*/appVersion: '${{ steps.set_output.outputs.new_version }}'/" ${{ env.CHART_PATH }}/Chart.yaml - - - name: Commit updated Helm chart version + sed -i "s/version:.*/version: ${{ steps.set_output.outputs.new_version }}/" ${{ env.CHART_PATH }}/Chart.yaml + - name: Create and push new tag run: | git config --global user.name 'github-actions' git config --global user.email 'github-actions@github.com' - git add ${{ env.CHART_PATH }}/Chart.yaml - git commit -m "Update Helm chart version to ${{ steps.set_output.outputs.new_version }}" - current_branch=$(git rev-parse --abbrev-ref HEAD) - git push origin $current_branch # Push changes to the current branch - - - name: Create and push new tag - run: | git tag ${{ steps.set_output.outputs.new_version }} git push origin ${{ steps.set_output.outputs.new_version }} - build-and-push-docker-api: runs-on: ubuntu-latest needs: determine-version @@ -92,7 +80,6 @@ jobs: key: ${{ runner.os }}-api-node-modules-${{ hashFiles('src/api/package-lock.json') }} restore-keys: | ${{ runner.os }}-api-node-modules- - - name: Install npm dependencies for API working-directory: src/api run: npm install @@ -109,7 +96,6 @@ jobs: key: ${{ runner.os }}-buildx-${{ hashFiles('src/api/Dockerfile', 'src/api/.dockerignore') }}-${{ github.sha }} restore-keys: | ${{ runner.os }}-buildx-${{ hashFiles('src/api/Dockerfile', 'src/api/.dockerignore') }}- - - name: Log in to Docker Hub uses: docker/login-action@v3 with: @@ -119,7 +105,6 @@ jobs: - name: Build and push Docker image API run: | docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:api-${{ needs.determine-version.outputs.new_version }} --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache,mode=max ./src/api - build-and-push-docker-job: runs-on: ubuntu-latest needs: determine-version @@ -140,7 +125,6 @@ jobs: key: ${{ runner.os }}-buildx-${{ hashFiles('src/Dockerfile', 'src/.dockerignore') }}-${{ github.sha }} restore-keys: | ${{ runner.os }}-buildx-${{ hashFiles('src/Dockerfile', 'src/.dockerignore') }}- - - name: Log in to Docker Hub uses: docker/login-action@v3 with: @@ -150,7 +134,6 @@ jobs: - name: Build and push Docker image Job run: | docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:job-${{ needs.determine-version.outputs.new_version }} --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache,mode=max ./src - publish-helm-chart: runs-on: ubuntu-latest needs: @@ -177,8 +160,7 @@ jobs: - name: Package Helm chart run: | - helm package ${{ env.CHART_PATH }} - + helm package opensource - name: Push Helm chart to Docker Hub run: | helm push $(ls *.tgz) oci://registry-1.docker.io/amelieloulou diff --git a/opensource/Chart.yaml b/opensource/Chart.yaml index 2504ef7..76cf49b 100644 --- a/opensource/Chart.yaml +++ b/opensource/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: transform-and-deliver-assets description: TADA 🎉 - Transform And Deliver Assets - Bouygues Telecom type: application -version: 0.0.2-beta -appVersion: '0.0.1' \ No newline at end of file +version: 0.0.3-beta +appVersion: '0.0.1' From 32c282e732271fcdca83a484ac6c6f2e8be8aa62 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Tue, 19 Nov 2024 15:30:16 +0100 Subject: [PATCH 072/114] Test to update helm chart version --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 733afb7..dce66d7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -158,7 +158,7 @@ jobs: with: version: v3.11.1 - - name: Package Helm chart + - name: Package Helm char run: | helm package opensource - name: Push Helm chart to Docker Hub From ae4a0b0c29f16341b274e977a078fcf72eee90be Mon Sep 17 00:00:00 2001 From: Matlavv Date: Tue, 19 Nov 2024 16:04:14 +0100 Subject: [PATCH 073/114] Test to update helm chart version --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dce66d7..733afb7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -158,7 +158,7 @@ jobs: with: version: v3.11.1 - - name: Package Helm char + - name: Package Helm chart run: | helm package opensource - name: Push Helm chart to Docker Hub From 084889b75b0008ada74d622184f0ceea5b95d95a Mon Sep 17 00:00:00 2001 From: Matlavv Date: Tue, 19 Nov 2024 17:27:11 +0100 Subject: [PATCH 074/114] Test to update helm chart version --- opensource/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/opensource/Chart.yaml b/opensource/Chart.yaml index 7cae920..7e9d974 100644 --- a/opensource/Chart.yaml +++ b/opensource/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: transform-and-deliver-assets description: TADA 🎉 - Transform And Deliver Assets - Bouygues Telecom type: application -version: 1.0.7 -appVersion: '1.0.7' \ No newline at end of file +version: 0.0.2-beta +appVersion: '0.0.1' From 934bfb691e31e97537f2abd8974f1a225664edb3 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Wed, 20 Nov 2024 10:19:22 +0100 Subject: [PATCH 075/114] Test to update helm chart version --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 733afb7..6c0d908 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -160,7 +160,7 @@ jobs: - name: Package Helm chart run: | - helm package opensource + helm package opensource --version ${{ needs.determine-version.outputs.new_version }} - name: Push Helm chart to Docker Hub run: | helm push $(ls *.tgz) oci://registry-1.docker.io/amelieloulou From 996f00ceb16f308fc713bc4a0a6901201d5c28e2 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Wed, 20 Nov 2024 10:24:33 +0100 Subject: [PATCH 076/114] Test to update helm chart version (helm version must be a string" --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6c0d908..e6cc135 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -160,7 +160,7 @@ jobs: - name: Package Helm chart run: | - helm package opensource --version ${{ needs.determine-version.outputs.new_version }} + helm package opensource --version "${{ needs.determine-version.outputs.new_version }}" - name: Push Helm chart to Docker Hub run: | helm push $(ls *.tgz) oci://registry-1.docker.io/amelieloulou From 62227d4371a026bee997e07351a10282501a1742 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Wed, 20 Nov 2024 10:25:32 +0100 Subject: [PATCH 077/114] Test to update helm chart version (helm version must be a string) minor --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e6cc135..eef11ea 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -158,7 +158,7 @@ jobs: with: version: v3.11.1 - - name: Package Helm chart + - name: Package Helm char run: | helm package opensource --version "${{ needs.determine-version.outputs.new_version }}" - name: Push Helm chart to Docker Hub From 5e88e1055bcc9834d1457cc7a0317b2fcafec582 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Am=C3=A9lie=20Loulergue?= Date: Wed, 20 Nov 2024 10:27:07 +0100 Subject: [PATCH 078/114] update to bouyguestelecom --- .github/workflows/ci.yml | 5 +++-- opensource/Chart.yaml | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eef11ea..7152690 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,10 +6,11 @@ on: - workflow/api-improve env: - IMAGE_NAME: amelieloulou/transform-and-deliver-assets + IMAGE_NAME: bouyguestelecom/tada CHART_PATH: ./opensource jobs: + determine-version: runs-on: ubuntu-latest outputs: @@ -163,4 +164,4 @@ jobs: helm package opensource --version "${{ needs.determine-version.outputs.new_version }}" - name: Push Helm chart to Docker Hub run: | - helm push $(ls *.tgz) oci://registry-1.docker.io/amelieloulou + helm push $(ls *.tgz) oci://registry-1.docker.io/bouyguestelecom diff --git a/opensource/Chart.yaml b/opensource/Chart.yaml index 7e9d974..3916002 100644 --- a/opensource/Chart.yaml +++ b/opensource/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 -name: transform-and-deliver-assets +name: tada description: TADA 🎉 - Transform And Deliver Assets - Bouygues Telecom type: application -version: 0.0.2-beta +version: '0.0.1' appVersion: '0.0.1' From 1c25051ede30fe03d88e1c1cde06beab4c6a6cbe Mon Sep 17 00:00:00 2001 From: Matlavv Date: Wed, 20 Nov 2024 10:33:02 +0100 Subject: [PATCH 079/114] Test to update helm chart version (helm version must be a string) --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7152690..e63ea94 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -159,8 +159,9 @@ jobs: with: version: v3.11.1 - - name: Package Helm char + - name: Package Helm chart run: | + version=$(cat ${{ env.CHART_PATH }}/Chart.yaml | version : "${{ needs.determine-version.outputs.new_version }}" | version without quotes : ${{ needs.determine-version.outputs.new_version }}') helm package opensource --version "${{ needs.determine-version.outputs.new_version }}" - name: Push Helm chart to Docker Hub run: | From 6b5aa2635a6d0b90fa0cf6f1dba90a751d0df78c Mon Sep 17 00:00:00 2001 From: Matlavv Date: Wed, 20 Nov 2024 10:52:35 +0100 Subject: [PATCH 080/114] Test to update helm chart version (helm version must be a string) --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e63ea94..8398ea9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -159,7 +159,7 @@ jobs: with: version: v3.11.1 - - name: Package Helm chart + - name: Package Helm char run: | version=$(cat ${{ env.CHART_PATH }}/Chart.yaml | version : "${{ needs.determine-version.outputs.new_version }}" | version without quotes : ${{ needs.determine-version.outputs.new_version }}') helm package opensource --version "${{ needs.determine-version.outputs.new_version }}" From 63c3c1721cf70d90cd3b9800787e4f8840c3412e Mon Sep 17 00:00:00 2001 From: Matlavv Date: Wed, 20 Nov 2024 10:57:59 +0100 Subject: [PATCH 081/114] Test to update helm chart version (helm version must be a string) --- .github/workflows/ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8398ea9..f7c5638 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -159,10 +159,9 @@ jobs: with: version: v3.11.1 - - name: Package Helm char + - name: Package Helm chart run: | - version=$(cat ${{ env.CHART_PATH }}/Chart.yaml | version : "${{ needs.determine-version.outputs.new_version }}" | version without quotes : ${{ needs.determine-version.outputs.new_version }}') helm package opensource --version "${{ needs.determine-version.outputs.new_version }}" - name: Push Helm chart to Docker Hub run: | - helm push $(ls *.tgz) oci://registry-1.docker.io/bouyguestelecom + helm push $(ls *.tgz) oci://registry-1.docker.io/bouyguestelecomcharts From 57b7526af860367c901287603bf745118c62bb53 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Wed, 20 Nov 2024 11:00:11 +0100 Subject: [PATCH 082/114] Test to update helm chart version (helm version must be a string) --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f7c5638..63f38dc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -161,6 +161,7 @@ jobs: - name: Package Helm chart run: | + version=$(cat ${{ env.CHART_PATH }}/Chart.yaml | version : "${{ needs.determine-version.outputs.new_version }}" | version without quotes : ${{ needs.determine-version.outputs.new_version }}) helm package opensource --version "${{ needs.determine-version.outputs.new_version }}" - name: Push Helm chart to Docker Hub run: | From 7fb2b6a07bd9642ce88799b0e44a22be96623095 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Wed, 20 Nov 2024 11:02:39 +0100 Subject: [PATCH 083/114] Test to update helm chart version (helm version must be a string) --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 63f38dc..f5cff12 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -159,7 +159,7 @@ jobs: with: version: v3.11.1 - - name: Package Helm chart + - name: Package Helm char run: | version=$(cat ${{ env.CHART_PATH }}/Chart.yaml | version : "${{ needs.determine-version.outputs.new_version }}" | version without quotes : ${{ needs.determine-version.outputs.new_version }}) helm package opensource --version "${{ needs.determine-version.outputs.new_version }}" From 4793604a6f311cd204221c8ff245e2847f315e61 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Wed, 20 Nov 2024 11:22:31 +0100 Subject: [PATCH 084/114] Test to update helm chart version --- .github/workflows/ci.yml | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f5cff12..82d3d5b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,6 +30,7 @@ jobs: fi echo "Latest tag: $latest_tag" echo "tag=$latest_tag" >> $GITHUB_ENV + - name: Determine next version id: set_output run: | @@ -57,15 +58,21 @@ jobs: echo "New version: $new_version" echo "new_version=$new_version" >> $GITHUB_ENV echo "new_version=$new_version" >> $GITHUB_OUTPUT + - name: Update Helm chart version run: | - sed -i "s/version:.*/version: ${{ steps.set_output.outputs.new_version }}/" ${{ env.CHART_PATH }}/Chart.yaml + sed -i "s/^version:.*/version: ${{ steps.set_output.outputs.new_version }}/" ${{ env.CHART_PATH }}/Chart.yaml + sed -i "s/^appVersion:.*/appVersion: '${{ steps.set_output.outputs.new_version }}'/" ${{ env.CHART_PATH }}/Chart.yaml + - name: Create and push new tag run: | git config --global user.name 'github-actions' git config --global user.email 'github-actions@github.com' + git add ${{ env.CHART_PATH }}/Chart.yaml + git commit -m "Update Helm chart version to ${{ steps.set_output.outputs.new_version }}" git tag ${{ steps.set_output.outputs.new_version }} - git push origin ${{ steps.set_output.outputs.new_version }} + git push origin HEAD --tags + build-and-push-docker-api: runs-on: ubuntu-latest needs: determine-version @@ -81,6 +88,7 @@ jobs: key: ${{ runner.os }}-api-node-modules-${{ hashFiles('src/api/package-lock.json') }} restore-keys: | ${{ runner.os }}-api-node-modules- + - name: Install npm dependencies for API working-directory: src/api run: npm install @@ -97,6 +105,7 @@ jobs: key: ${{ runner.os }}-buildx-${{ hashFiles('src/api/Dockerfile', 'src/api/.dockerignore') }}-${{ github.sha }} restore-keys: | ${{ runner.os }}-buildx-${{ hashFiles('src/api/Dockerfile', 'src/api/.dockerignore') }}- + - name: Log in to Docker Hub uses: docker/login-action@v3 with: @@ -106,6 +115,7 @@ jobs: - name: Build and push Docker image API run: | docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:api-${{ needs.determine-version.outputs.new_version }} --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache,mode=max ./src/api + build-and-push-docker-job: runs-on: ubuntu-latest needs: determine-version @@ -126,6 +136,7 @@ jobs: key: ${{ runner.os }}-buildx-${{ hashFiles('src/Dockerfile', 'src/.dockerignore') }}-${{ github.sha }} restore-keys: | ${{ runner.os }}-buildx-${{ hashFiles('src/Dockerfile', 'src/.dockerignore') }}- + - name: Log in to Docker Hub uses: docker/login-action@v3 with: @@ -135,6 +146,7 @@ jobs: - name: Build and push Docker image Job run: | docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:job-${{ needs.determine-version.outputs.new_version }} --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache,mode=max ./src + publish-helm-chart: runs-on: ubuntu-latest needs: @@ -159,10 +171,10 @@ jobs: with: version: v3.11.1 - - name: Package Helm char + - name: Package Helm chart run: | - version=$(cat ${{ env.CHART_PATH }}/Chart.yaml | version : "${{ needs.determine-version.outputs.new_version }}" | version without quotes : ${{ needs.determine-version.outputs.new_version }}) - helm package opensource --version "${{ needs.determine-version.outputs.new_version }}" + helm package ${{ env.CHART_PATH }} --version ${{ needs.determine-version.outputs.new_version }} + - name: Push Helm chart to Docker Hub run: | helm push $(ls *.tgz) oci://registry-1.docker.io/bouyguestelecomcharts From 6d1882371bd3efd58d347f36cf14867458bfad8c Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 20 Nov 2024 10:22:44 +0000 Subject: [PATCH 085/114] Update Helm chart version to 1.1.12 --- opensource/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/opensource/Chart.yaml b/opensource/Chart.yaml index 3916002..b67b1c0 100644 --- a/opensource/Chart.yaml +++ b/opensource/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: tada description: TADA 🎉 - Transform And Deliver Assets - Bouygues Telecom type: application -version: '0.0.1' -appVersion: '0.0.1' +version: 1.1.12 +appVersion: '1.1.12' From 14615e2fb7279f1378dbe72622aaff2eea0a1757 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Wed, 20 Nov 2024 11:29:49 +0100 Subject: [PATCH 086/114] Test to update helm chart version --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 82d3d5b..d90075e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -173,7 +173,9 @@ jobs: - name: Package Helm chart run: | - helm package ${{ env.CHART_PATH }} --version ${{ needs.determine-version.outputs.new_version }} + new_version=${{ needs.determine-version.outputs.new_version }} + echo "Packaging Helm chart with version $new_version" + helm package ${{ env.CHART_PATH }} --version $new_version - name: Push Helm chart to Docker Hub run: | From f7bc70509799667b1f83139b9f596a811c22f897 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 20 Nov 2024 10:30:13 +0000 Subject: [PATCH 087/114] Update Helm chart version to 1.1.13 --- opensource/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/opensource/Chart.yaml b/opensource/Chart.yaml index b67b1c0..ac9c98d 100644 --- a/opensource/Chart.yaml +++ b/opensource/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: tada description: TADA 🎉 - Transform And Deliver Assets - Bouygues Telecom type: application -version: 1.1.12 -appVersion: '1.1.12' +version: 1.1.13 +appVersion: '1.1.13' From 53f102b3e44b82597b96019e5832ce9461316196 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Wed, 20 Nov 2024 11:30:18 +0100 Subject: [PATCH 088/114] Test to update helm chart version --- .github/workflows/ci.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d90075e..25d61ab 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,6 @@ env: CHART_PATH: ./opensource jobs: - determine-version: runs-on: ubuntu-latest outputs: @@ -61,16 +60,16 @@ jobs: - name: Update Helm chart version run: | - sed -i "s/^version:.*/version: ${{ steps.set_output.outputs.new_version }}/" ${{ env.CHART_PATH }}/Chart.yaml - sed -i "s/^appVersion:.*/appVersion: '${{ steps.set_output.outputs.new_version }}'/" ${{ env.CHART_PATH }}/Chart.yaml + sed -i "s/^version:.*/version: ${{ needs.determine-version.outputs.new_version }}/" ${{ env.CHART_PATH }}/Chart.yaml + sed -i "s/^appVersion:.*/appVersion: '${{ needs.determine-version.outputs.new_version }}'/" ${{ env.CHART_PATH }}/Chart.yaml - - name: Create and push new tag + - name: Commit updated Helm chart version run: | git config --global user.name 'github-actions' git config --global user.email 'github-actions@github.com' git add ${{ env.CHART_PATH }}/Chart.yaml - git commit -m "Update Helm chart version to ${{ steps.set_output.outputs.new_version }}" - git tag ${{ steps.set_output.outputs.new_version }} + git commit -m "Update Helm chart version to ${{ needs.determine-version.outputs.new_version }}" + git tag ${{ needs.determine-version.outputs.new_version }} git push origin HEAD --tags build-and-push-docker-api: @@ -175,7 +174,7 @@ jobs: run: | new_version=${{ needs.determine-version.outputs.new_version }} echo "Packaging Helm chart with version $new_version" - helm package ${{ env.CHART_PATH }} --version $new_version + helm package ${{ env.CHART_PATH }} --version $new_version - name: Push Helm chart to Docker Hub run: | From 50b848fe81096e5756eb6458a253fb66712f385b Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 20 Nov 2024 10:30:41 +0000 Subject: [PATCH 089/114] Update Helm chart version to --- opensource/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/opensource/Chart.yaml b/opensource/Chart.yaml index ac9c98d..3175ce6 100644 --- a/opensource/Chart.yaml +++ b/opensource/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: tada description: TADA 🎉 - Transform And Deliver Assets - Bouygues Telecom type: application -version: 1.1.13 -appVersion: '1.1.13' +version: +appVersion: '' From cbb982ea435fdbd758401d5af0a34000f18c2af3 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Wed, 20 Nov 2024 11:46:10 +0100 Subject: [PATCH 090/114] Test to update helm chart version --- .github/workflows/ci.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 25d61ab..69f9b67 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -172,10 +172,12 @@ jobs: - name: Package Helm chart run: | - new_version=${{ needs.determine-version.outputs.new_version }} - echo "Packaging Helm chart with version $new_version" - helm package ${{ env.CHART_PATH }} --version $new_version + new_version="${{ needs.determine-version.outputs.new_version }}" + echo "Packaging Helm chart with version $new_version" + helm package ${{ env.CHART_PATH }} --version $new_version + echo "::set-output name=version::$new_version" - name: Push Helm chart to Docker Hub run: | - helm push $(ls *.tgz) oci://registry-1.docker.io/bouyguestelecomcharts + echo "version is ${{ steps.package.outputs.version }}" + helm push $(ls *.tgz) oci://registry-1.docker.io/bouyguestelecomcharts From fb34bdf30d7eccbd674705b2d1f3238dbc2dcd86 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Wed, 20 Nov 2024 11:46:52 +0100 Subject: [PATCH 091/114] Test to update helm chart version --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 69f9b67..9bc50cf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -170,7 +170,7 @@ jobs: with: version: v3.11.1 - - name: Package Helm chart + - name: Package Helm char run: | new_version="${{ needs.determine-version.outputs.new_version }}" echo "Packaging Helm chart with version $new_version" From 953f0ff9cc73e3056f12fe62990e47ae403e6957 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Wed, 20 Nov 2024 11:49:04 +0100 Subject: [PATCH 092/114] Test to update helm chart version --- .github/workflows/ci.yml | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9bc50cf..865164e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,6 @@ jobs: fi echo "Latest tag: $latest_tag" echo "tag=$latest_tag" >> $GITHUB_ENV - - name: Determine next version id: set_output run: | @@ -57,12 +56,10 @@ jobs: echo "New version: $new_version" echo "new_version=$new_version" >> $GITHUB_ENV echo "new_version=$new_version" >> $GITHUB_OUTPUT - - name: Update Helm chart version run: | sed -i "s/^version:.*/version: ${{ needs.determine-version.outputs.new_version }}/" ${{ env.CHART_PATH }}/Chart.yaml sed -i "s/^appVersion:.*/appVersion: '${{ needs.determine-version.outputs.new_version }}'/" ${{ env.CHART_PATH }}/Chart.yaml - - name: Commit updated Helm chart version run: | git config --global user.name 'github-actions' @@ -71,7 +68,6 @@ jobs: git commit -m "Update Helm chart version to ${{ needs.determine-version.outputs.new_version }}" git tag ${{ needs.determine-version.outputs.new_version }} git push origin HEAD --tags - build-and-push-docker-api: runs-on: ubuntu-latest needs: determine-version @@ -87,7 +83,6 @@ jobs: key: ${{ runner.os }}-api-node-modules-${{ hashFiles('src/api/package-lock.json') }} restore-keys: | ${{ runner.os }}-api-node-modules- - - name: Install npm dependencies for API working-directory: src/api run: npm install @@ -104,7 +99,6 @@ jobs: key: ${{ runner.os }}-buildx-${{ hashFiles('src/api/Dockerfile', 'src/api/.dockerignore') }}-${{ github.sha }} restore-keys: | ${{ runner.os }}-buildx-${{ hashFiles('src/api/Dockerfile', 'src/api/.dockerignore') }}- - - name: Log in to Docker Hub uses: docker/login-action@v3 with: @@ -114,7 +108,6 @@ jobs: - name: Build and push Docker image API run: | docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:api-${{ needs.determine-version.outputs.new_version }} --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache,mode=max ./src/api - build-and-push-docker-job: runs-on: ubuntu-latest needs: determine-version @@ -135,7 +128,6 @@ jobs: key: ${{ runner.os }}-buildx-${{ hashFiles('src/Dockerfile', 'src/.dockerignore') }}-${{ github.sha }} restore-keys: | ${{ runner.os }}-buildx-${{ hashFiles('src/Dockerfile', 'src/.dockerignore') }}- - - name: Log in to Docker Hub uses: docker/login-action@v3 with: @@ -145,7 +137,6 @@ jobs: - name: Build and push Docker image Job run: | docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:job-${{ needs.determine-version.outputs.new_version }} --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache,mode=max ./src - publish-helm-chart: runs-on: ubuntu-latest needs: @@ -170,14 +161,13 @@ jobs: with: version: v3.11.1 - - name: Package Helm char + - name: Package Helm chart run: | - new_version="${{ needs.determine-version.outputs.new_version }}" - echo "Packaging Helm chart with version $new_version" - helm package ${{ env.CHART_PATH }} --version $new_version - echo "::set-output name=version::$new_version" - + new_version="${{ needs.determine-version.outputs.new_version }}" + echo "Packaging Helm chart with version $new_version" + helm package ${{ env.CHART_PATH }} --version $new_version + echo "::set-output name=version::$new_version" - name: Push Helm chart to Docker Hub run: | - echo "version is ${{ steps.package.outputs.version }}" - helm push $(ls *.tgz) oci://registry-1.docker.io/bouyguestelecomcharts + echo "version is ${{ steps.package.outputs.version }}" + helm push $(ls *.tgz) oci://registry-1.docker.io/bouyguestelecomcharts From 6688d760b2300aa57c5375566038987da9106db5 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Wed, 20 Nov 2024 11:51:31 +0100 Subject: [PATCH 093/114] Test to update helm chart version --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 865164e..6463622 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -161,7 +161,7 @@ jobs: with: version: v3.11.1 - - name: Package Helm chart + - name: Package Helm char run: | new_version="${{ needs.determine-version.outputs.new_version }}" echo "Packaging Helm chart with version $new_version" From 0b64fb3656fca76b779c0b0e449972f70955ad64 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Wed, 20 Nov 2024 11:53:11 +0100 Subject: [PATCH 094/114] Test to update helm chart version --- .github/workflows/ci.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6463622..5888a2b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,7 @@ on: - workflow/api-improve env: - IMAGE_NAME: bouyguestelecom/tada + IMAGE_NAME: amelieloulou/transform-and-deliver-assets CHART_PATH: ./opensource jobs: @@ -58,16 +58,13 @@ jobs: echo "new_version=$new_version" >> $GITHUB_OUTPUT - name: Update Helm chart version run: | - sed -i "s/^version:.*/version: ${{ needs.determine-version.outputs.new_version }}/" ${{ env.CHART_PATH }}/Chart.yaml - sed -i "s/^appVersion:.*/appVersion: '${{ needs.determine-version.outputs.new_version }}'/" ${{ env.CHART_PATH }}/Chart.yaml - - name: Commit updated Helm chart version + sed -i "s/version:.*/version: ${{ steps.set_output.outputs.new_version }}/" ${{ env.CHART_PATH }}/Chart.yaml + - name: Create and push new tag run: | git config --global user.name 'github-actions' git config --global user.email 'github-actions@github.com' - git add ${{ env.CHART_PATH }}/Chart.yaml - git commit -m "Update Helm chart version to ${{ needs.determine-version.outputs.new_version }}" - git tag ${{ needs.determine-version.outputs.new_version }} - git push origin HEAD --tags + git tag ${{ steps.set_output.outputs.new_version }} + git push origin ${{ steps.set_output.outputs.new_version }} build-and-push-docker-api: runs-on: ubuntu-latest needs: determine-version From 4640f5d1f647ba4d010874a9fcb1e221a48701b2 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Wed, 20 Nov 2024 11:55:11 +0100 Subject: [PATCH 095/114] Test to update helm chart version --- .github/workflows/ci.yml | 80 ++++++++++++++++++++-------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5888a2b..d3b89e2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -65,46 +65,46 @@ jobs: git config --global user.email 'github-actions@github.com' git tag ${{ steps.set_output.outputs.new_version }} git push origin ${{ steps.set_output.outputs.new_version }} - build-and-push-docker-api: - runs-on: ubuntu-latest - needs: determine-version - - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - - name: Cache npm dependencies for API - uses: actions/cache@v3 - with: - path: src/api/node_modules - key: ${{ runner.os }}-api-node-modules-${{ hashFiles('src/api/package-lock.json') }} - restore-keys: | - ${{ runner.os }}-api-node-modules- - - name: Install npm dependencies for API - working-directory: src/api - run: npm install - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - with: - install: true - - - name: Cache Docker layers - uses: actions/cache@v3 - with: - path: /tmp/.buildx-cache - key: ${{ runner.os }}-buildx-${{ hashFiles('src/api/Dockerfile', 'src/api/.dockerignore') }}-${{ github.sha }} - restore-keys: | - ${{ runner.os }}-buildx-${{ hashFiles('src/api/Dockerfile', 'src/api/.dockerignore') }}- - - name: Log in to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - - name: Build and push Docker image API - run: | - docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:api-${{ needs.determine-version.outputs.new_version }} --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache,mode=max ./src/api +build-and-push-docker-api: + runs-on: ubuntu-latest + needs: determine-version + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Cache npm dependencies for API + uses: actions/cache@v3 + with: + path: src/api/node_modules + key: ${{ runner.os }}-api-node-modules-${{ hashFiles('src/api/package-lock.json') }} + restore-keys: | + ${{ runner.os }}-api-node-modules- + - name: Install npm dependencies for API + working-directory: src/api + run: npm install + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + with: + install: true + + - name: Cache Docker layers + uses: actions/cache@v3 + with: + path: /tmp/.buildx-cache + key: ${{ runner.os }}-buildx-${{ hashFiles('src/api/Dockerfile', 'src/api/.dockerignore') }}-${{ github.sha }} + restore-keys: | + ${{ runner.os }}-buildx-${{ hashFiles('src/api/Dockerfile', 'src/api/.dockerignore') }}- + - name: Log in to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + - name: Build and push Docker image API + run: | + docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:api-${{ needs.determine-version.outputs.new_version }} --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache,mode=max ./src/api build-and-push-docker-job: runs-on: ubuntu-latest needs: determine-version From 073d5212bc1f2083de7fea5e93a589117ae2a21e Mon Sep 17 00:00:00 2001 From: Matlavv Date: Wed, 20 Nov 2024 11:56:37 +0100 Subject: [PATCH 096/114] Test to update helm chart version --- .github/workflows/ci.yml | 80 ++++++++++++++++++++-------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d3b89e2..5888a2b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -65,46 +65,46 @@ jobs: git config --global user.email 'github-actions@github.com' git tag ${{ steps.set_output.outputs.new_version }} git push origin ${{ steps.set_output.outputs.new_version }} -build-and-push-docker-api: - runs-on: ubuntu-latest - needs: determine-version - - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - - name: Cache npm dependencies for API - uses: actions/cache@v3 - with: - path: src/api/node_modules - key: ${{ runner.os }}-api-node-modules-${{ hashFiles('src/api/package-lock.json') }} - restore-keys: | - ${{ runner.os }}-api-node-modules- - - name: Install npm dependencies for API - working-directory: src/api - run: npm install - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - with: - install: true - - - name: Cache Docker layers - uses: actions/cache@v3 - with: - path: /tmp/.buildx-cache - key: ${{ runner.os }}-buildx-${{ hashFiles('src/api/Dockerfile', 'src/api/.dockerignore') }}-${{ github.sha }} - restore-keys: | - ${{ runner.os }}-buildx-${{ hashFiles('src/api/Dockerfile', 'src/api/.dockerignore') }}- - - name: Log in to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - - name: Build and push Docker image API - run: | - docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:api-${{ needs.determine-version.outputs.new_version }} --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache,mode=max ./src/api + build-and-push-docker-api: + runs-on: ubuntu-latest + needs: determine-version + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Cache npm dependencies for API + uses: actions/cache@v3 + with: + path: src/api/node_modules + key: ${{ runner.os }}-api-node-modules-${{ hashFiles('src/api/package-lock.json') }} + restore-keys: | + ${{ runner.os }}-api-node-modules- + - name: Install npm dependencies for API + working-directory: src/api + run: npm install + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + with: + install: true + + - name: Cache Docker layers + uses: actions/cache@v3 + with: + path: /tmp/.buildx-cache + key: ${{ runner.os }}-buildx-${{ hashFiles('src/api/Dockerfile', 'src/api/.dockerignore') }}-${{ github.sha }} + restore-keys: | + ${{ runner.os }}-buildx-${{ hashFiles('src/api/Dockerfile', 'src/api/.dockerignore') }}- + - name: Log in to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + - name: Build and push Docker image API + run: | + docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:api-${{ needs.determine-version.outputs.new_version }} --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache,mode=max ./src/api build-and-push-docker-job: runs-on: ubuntu-latest needs: determine-version From 9449be40d5d443ee187a85cdc7de5e5b9170bd5f Mon Sep 17 00:00:00 2001 From: Matlavv Date: Wed, 20 Nov 2024 12:05:14 +0100 Subject: [PATCH 097/114] Test to update helm chart version --- .github/workflows/ci.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5888a2b..fd969a9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,7 @@ on: - workflow/api-improve env: - IMAGE_NAME: amelieloulou/transform-and-deliver-assets + IMAGE_NAME: bouyguestelecom/tada CHART_PATH: ./opensource jobs: @@ -58,13 +58,16 @@ jobs: echo "new_version=$new_version" >> $GITHUB_OUTPUT - name: Update Helm chart version run: | - sed -i "s/version:.*/version: ${{ steps.set_output.outputs.new_version }}/" ${{ env.CHART_PATH }}/Chart.yaml - - name: Create and push new tag + sed -i "s/^version:.*/version: ${{ needs.determine-version.outputs.new_version }}/" ${{ env.CHART_PATH }}/Chart.yaml + sed -i "s/^appVersion:.*/appVersion: '${{ needs.determine-version.outputs.new_version }}'/" ${{ env.CHART_PATH }}/Chart.yaml + - name: Commit updated Helm chart version run: | git config --global user.name 'github-actions' git config --global user.email 'github-actions@github.com' - git tag ${{ steps.set_output.outputs.new_version }} - git push origin ${{ steps.set_output.outputs.new_version }} + git add ${{ env.CHART_PATH }}/Chart.yaml + git commit -m "Update Helm chart version to ${{ needs.determine-version.outputs.new_version }}" + git tag ${{ needs.determine-version.outputs.new_version }} + git push origin HEAD --tags build-and-push-docker-api: runs-on: ubuntu-latest needs: determine-version @@ -158,13 +161,11 @@ jobs: with: version: v3.11.1 - - name: Package Helm char + - name: Package Helm chart run: | - new_version="${{ needs.determine-version.outputs.new_version }}" + new_version=${{ needs.determine-version.outputs.new_version }} echo "Packaging Helm chart with version $new_version" helm package ${{ env.CHART_PATH }} --version $new_version - echo "::set-output name=version::$new_version" - name: Push Helm chart to Docker Hub run: | - echo "version is ${{ steps.package.outputs.version }}" helm push $(ls *.tgz) oci://registry-1.docker.io/bouyguestelecomcharts From 959497e659bb57313329f1b9361e9ff046f0d114 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Wed, 20 Nov 2024 12:07:54 +0100 Subject: [PATCH 098/114] Test to update helm chart version --- .github/workflows/ci.yml | 40 ++++++++++++++++++++++++++++++++-------- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fd969a9..430186f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,15 +3,42 @@ name: CI Docker and Helm on: push: branches: - - workflow/api-improve + - workflow/add-test env: IMAGE_NAME: bouyguestelecom/tada CHART_PATH: ./opensource jobs: + tests: + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v2 + - name: Install bru (Bruno) + run: | + npm install -g @usebruno/cli + - name: Run docker-compose + uses: hoverkraft-tech/compose-action@v2.0.1 + with: + compose-file: "./docker-compose.yml" + - name: Copy tmp/images for tests + run: | + cp -r local/images /tmp/images + continue-on-error: false + - name: Run Tests + run: | + cd ${{ github.workspace }}/TESTS + bru run flows/ --env LOCAL -r --bail + continue-on-error: false + + - name: Report test results + if: failure() + run: echo "Tests failed." + determine-version: runs-on: ubuntu-latest + needs: tests outputs: new_version: ${{ steps.set_output.outputs.new_version }} @@ -58,16 +85,13 @@ jobs: echo "new_version=$new_version" >> $GITHUB_OUTPUT - name: Update Helm chart version run: | - sed -i "s/^version:.*/version: ${{ needs.determine-version.outputs.new_version }}/" ${{ env.CHART_PATH }}/Chart.yaml - sed -i "s/^appVersion:.*/appVersion: '${{ needs.determine-version.outputs.new_version }}'/" ${{ env.CHART_PATH }}/Chart.yaml - - name: Commit updated Helm chart version + sed -i "s/version:.*/version: ${{ steps.set_output.outputs.new_version }}/" ${{ env.CHART_PATH }}/Chart.yaml + - name: Create and push new tag run: | git config --global user.name 'github-actions' git config --global user.email 'github-actions@github.com' - git add ${{ env.CHART_PATH }}/Chart.yaml - git commit -m "Update Helm chart version to ${{ needs.determine-version.outputs.new_version }}" - git tag ${{ needs.determine-version.outputs.new_version }} - git push origin HEAD --tags + git tag ${{ steps.set_output.outputs.new_version }} + git push origin ${{ steps.set_output.outputs.new_version }} build-and-push-docker-api: runs-on: ubuntu-latest needs: determine-version From 88064214d0771b8ba258e953f65ee0dec94bbbe7 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Wed, 20 Nov 2024 12:09:41 +0100 Subject: [PATCH 099/114] Test to update helm chart version with echo --- .github/workflows/ci.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 430186f..4440470 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,7 +3,7 @@ name: CI Docker and Helm on: push: branches: - - workflow/add-test + - workflow/api-improve env: IMAGE_NAME: bouyguestelecom/tada @@ -131,6 +131,8 @@ jobs: - name: Build and push Docker image API run: | + new_version=${{ needs.determine-version.outputs.new_version }} + echo "Docker api with version $new_version" docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:api-${{ needs.determine-version.outputs.new_version }} --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache,mode=max ./src/api build-and-push-docker-job: runs-on: ubuntu-latest @@ -160,6 +162,8 @@ jobs: - name: Build and push Docker image Job run: | + new_version=${{ needs.determine-version.outputs.new_version }} + echo "Docker job with version $new_version" docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:job-${{ needs.determine-version.outputs.new_version }} --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache,mode=max ./src publish-helm-chart: runs-on: ubuntu-latest @@ -189,7 +193,7 @@ jobs: run: | new_version=${{ needs.determine-version.outputs.new_version }} echo "Packaging Helm chart with version $new_version" - helm package ${{ env.CHART_PATH }} --version $new_version + helm package opensource --version $new_version - name: Push Helm chart to Docker Hub run: | helm push $(ls *.tgz) oci://registry-1.docker.io/bouyguestelecomcharts From 21f41521803418074a935ba76ab24517ee7a30c0 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Wed, 20 Nov 2024 12:12:19 +0100 Subject: [PATCH 100/114] Test to update helm chart version with echo --- .github/workflows/ci.yml | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4440470..7d97223 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,35 +10,8 @@ env: CHART_PATH: ./opensource jobs: - tests: - runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@v2 - - name: Install bru (Bruno) - run: | - npm install -g @usebruno/cli - - name: Run docker-compose - uses: hoverkraft-tech/compose-action@v2.0.1 - with: - compose-file: "./docker-compose.yml" - - name: Copy tmp/images for tests - run: | - cp -r local/images /tmp/images - continue-on-error: false - - name: Run Tests - run: | - cd ${{ github.workspace }}/TESTS - bru run flows/ --env LOCAL -r --bail - continue-on-error: false - - - name: Report test results - if: failure() - run: echo "Tests failed." - determine-version: runs-on: ubuntu-latest - needs: tests outputs: new_version: ${{ steps.set_output.outputs.new_version }} From 5c7b75d612e0b14ee61cd69dfe9abaa195f75311 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Wed, 20 Nov 2024 12:22:08 +0100 Subject: [PATCH 101/114] Test to update helm chart --- .github/workflows/ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7d97223..b78319e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -65,6 +65,7 @@ jobs: git config --global user.email 'github-actions@github.com' git tag ${{ steps.set_output.outputs.new_version }} git push origin ${{ steps.set_output.outputs.new_version }} + build-and-push-docker-api: runs-on: ubuntu-latest needs: determine-version @@ -107,6 +108,7 @@ jobs: new_version=${{ needs.determine-version.outputs.new_version }} echo "Docker api with version $new_version" docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:api-${{ needs.determine-version.outputs.new_version }} --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache,mode=max ./src/api + build-and-push-docker-job: runs-on: ubuntu-latest needs: determine-version @@ -138,6 +140,7 @@ jobs: new_version=${{ needs.determine-version.outputs.new_version }} echo "Docker job with version $new_version" docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:job-${{ needs.determine-version.outputs.new_version }} --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache,mode=max ./src + publish-helm-chart: runs-on: ubuntu-latest needs: @@ -164,9 +167,7 @@ jobs: - name: Package Helm chart run: | - new_version=${{ needs.determine-version.outputs.new_version }} - echo "Packaging Helm chart with version $new_version" - helm package opensource --version $new_version + helm package opensource - name: Push Helm chart to Docker Hub run: | helm push $(ls *.tgz) oci://registry-1.docker.io/bouyguestelecomcharts From 899107ce0085bb39cc0c60f939f39b093fa3212f Mon Sep 17 00:00:00 2001 From: Matlavv Date: Wed, 20 Nov 2024 12:26:52 +0100 Subject: [PATCH 102/114] Test to update helm chart with version in Chart.yaml --- opensource/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/opensource/Chart.yaml b/opensource/Chart.yaml index 3175ce6..54a2b25 100644 --- a/opensource/Chart.yaml +++ b/opensource/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: tada description: TADA 🎉 - Transform And Deliver Assets - Bouygues Telecom type: application -version: -appVersion: '' +version: '0.1.0' +appVersion: '0.1.0' From 48c79502ad2dcf82ba4e21eb1545cd47357c3179 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Wed, 20 Nov 2024 12:26:57 +0100 Subject: [PATCH 103/114] Test to update helm chart with version in Chart.yaml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b78319e..2445174 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -165,7 +165,7 @@ jobs: with: version: v3.11.1 - - name: Package Helm chart + - name: Package Helm char run: | helm package opensource - name: Push Helm chart to Docker Hub From db2e2e6485328a79b853a97c38d85551256a17a3 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Wed, 20 Nov 2024 15:47:08 +0100 Subject: [PATCH 104/114] Trying test version --- .github/workflows/ci.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2445174..a2eadee 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,8 +45,14 @@ jobs: elif [[ "${{ github.event.head_commit.message }}" == *"minor"* ]]; then minor=$((minor + 1)) patch=0 - else + elif [[ "${{ github.event.head_commit.message }}" == *"patch"* ]]; then patch=$((patch + 1)) + else + branch_name=$(echo "${{ github.ref }}" | sed 's/refs\/heads\///') + new_version="0.0.1-${branch_name}" + echo "new_version=$new_version" >> $GITHUB_ENV + echo "new_version=$new_version" >> $GITHUB_OUTPUT + exit 0 fi new_version="$major.$minor.$patch" while git rev-parse "refs/tags/$new_version" >/dev/null 2>&1; do From 7ddd8ff6dd3f50cda9fc0c2a3bc6c6b75123cf63 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Wed, 20 Nov 2024 15:48:07 +0100 Subject: [PATCH 105/114] Trying test version --- .github/workflows/ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a2eadee..3e25ffc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,9 +62,6 @@ jobs: echo "New version: $new_version" echo "new_version=$new_version" >> $GITHUB_ENV echo "new_version=$new_version" >> $GITHUB_OUTPUT - - name: Update Helm chart version - run: | - sed -i "s/version:.*/version: ${{ steps.set_output.outputs.new_version }}/" ${{ env.CHART_PATH }}/Chart.yaml - name: Create and push new tag run: | git config --global user.name 'github-actions' From 70a56b3ff93182262705631bc0a4bd352357eaf8 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Wed, 20 Nov 2024 15:52:23 +0100 Subject: [PATCH 106/114] Trying test version --- .github/workflows/ci.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3e25ffc..a86f0d3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,6 +29,7 @@ jobs: fi echo "Latest tag: $latest_tag" echo "tag=$latest_tag" >> $GITHUB_ENV + - name: Determine next version id: set_output run: | @@ -48,7 +49,7 @@ jobs: elif [[ "${{ github.event.head_commit.message }}" == *"patch"* ]]; then patch=$((patch + 1)) else - branch_name=$(echo "${{ github.ref }}" | sed 's/refs\/heads\///') + branch_name=$(echo "${{ github.ref }}" | sed 's/refs\/heads\///' | sed 's/\//-/g') new_version="0.0.1-${branch_name}" echo "new_version=$new_version" >> $GITHUB_ENV echo "new_version=$new_version" >> $GITHUB_OUTPUT @@ -62,6 +63,7 @@ jobs: echo "New version: $new_version" echo "new_version=$new_version" >> $GITHUB_ENV echo "new_version=$new_version" >> $GITHUB_OUTPUT + - name: Create and push new tag run: | git config --global user.name 'github-actions' @@ -84,6 +86,7 @@ jobs: key: ${{ runner.os }}-api-node-modules-${{ hashFiles('src/api/package-lock.json') }} restore-keys: | ${{ runner.os }}-api-node-modules- + - name: Install npm dependencies for API working-directory: src/api run: npm install @@ -100,6 +103,7 @@ jobs: key: ${{ runner.os }}-buildx-${{ hashFiles('src/api/Dockerfile', 'src/api/.dockerignore') }}-${{ github.sha }} restore-keys: | ${{ runner.os }}-buildx-${{ hashFiles('src/api/Dockerfile', 'src/api/.dockerignore') }}- + - name: Log in to Docker Hub uses: docker/login-action@v3 with: @@ -110,7 +114,7 @@ jobs: run: | new_version=${{ needs.determine-version.outputs.new_version }} echo "Docker api with version $new_version" - docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:api-${{ needs.determine-version.outputs.new_version }} --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache,mode=max ./src/api + docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:api-${new_version} --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache,mode=max ./src/api build-and-push-docker-job: runs-on: ubuntu-latest @@ -132,6 +136,7 @@ jobs: key: ${{ runner.os }}-buildx-${{ hashFiles('src/Dockerfile', 'src/.dockerignore') }}-${{ github.sha }} restore-keys: | ${{ runner.os }}-buildx-${{ hashFiles('src/Dockerfile', 'src/.dockerignore') }}- + - name: Log in to Docker Hub uses: docker/login-action@v3 with: @@ -142,7 +147,7 @@ jobs: run: | new_version=${{ needs.determine-version.outputs.new_version }} echo "Docker job with version $new_version" - docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:job-${{ needs.determine-version.outputs.new_version }} --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache,mode=max ./src + docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:job-${new_version} --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache,mode=max ./src publish-helm-chart: runs-on: ubuntu-latest @@ -168,9 +173,10 @@ jobs: with: version: v3.11.1 - - name: Package Helm char + - name: Package Helm chart run: | helm package opensource + - name: Push Helm chart to Docker Hub run: | helm push $(ls *.tgz) oci://registry-1.docker.io/bouyguestelecomcharts From e8131cfb258f5a77d7cf0c5e92c05bb52870735d Mon Sep 17 00:00:00 2001 From: Matlavv Date: Wed, 20 Nov 2024 15:59:45 +0100 Subject: [PATCH 107/114] Trying test version patch --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a86f0d3..fcc5e8e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: new_version: ${{ steps.set_output.outputs.new_version }} steps: - - name: Checkout repository + - name: Checkout repositor uses: actions/checkout@v3 - name: Get the latest tag From 579292db052e6f07728a86276cd3230578283e1b Mon Sep 17 00:00:00 2001 From: Matlavv Date: Wed, 20 Nov 2024 16:07:47 +0100 Subject: [PATCH 108/114] Trying to publish on chart minor --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fcc5e8e..2ebd423 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: new_version: ${{ steps.set_output.outputs.new_version }} steps: - - name: Checkout repositor + - name: Checkout repository uses: actions/checkout@v3 - name: Get the latest tag @@ -165,8 +165,8 @@ jobs: - name: Log in to Docker Hub uses: docker/login-action@v3 with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} + username: ${{ secrets.DOCKER_CHART_USERNAME }} + password: ${{ secrets.DOCKER_CHART_PASSWORD }} - name: Install Helm uses: azure/setup-helm@v3 From d2173ab723566acf9578b20e66d86566f9b453cf Mon Sep 17 00:00:00 2001 From: Matlavv Date: Wed, 20 Nov 2024 16:18:41 +0100 Subject: [PATCH 109/114] Trying to update helm chart version --- .github/workflows/ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2ebd423..cabcf29 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -146,7 +146,6 @@ jobs: - name: Build and push Docker image Job run: | new_version=${{ needs.determine-version.outputs.new_version }} - echo "Docker job with version $new_version" docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:job-${new_version} --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache,mode=max ./src publish-helm-chart: @@ -179,4 +178,6 @@ jobs: - name: Push Helm chart to Docker Hub run: | - helm push $(ls *.tgz) oci://registry-1.docker.io/bouyguestelecomcharts + echo "Pushing Helm chart to Docker Hub with version ${{ needs.determine-version.outputs.new_version }}" + echo "pushing with version '${{ needs.determine-version.outputs.new_version }}'" + helm push $(ls *.tgz) oci://registry-1.docker.io/bouyguestelecomcharts --version ${{ needs.determine-version.outputs.new_version }} From d56f1086b189975790892353543b97fa64e4491d Mon Sep 17 00:00:00 2001 From: Matlavv Date: Wed, 20 Nov 2024 16:26:34 +0100 Subject: [PATCH 110/114] Trying to update helm chart version --- .github/workflows/ci.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cabcf29..18e9088 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,19 +46,14 @@ jobs: elif [[ "${{ github.event.head_commit.message }}" == *"minor"* ]]; then minor=$((minor + 1)) patch=0 - elif [[ "${{ github.event.head_commit.message }}" == *"patch"* ]]; then - patch=$((patch + 1)) else + patch=$((patch + 1)) branch_name=$(echo "${{ github.ref }}" | sed 's/refs\/heads\///' | sed 's/\//-/g') - new_version="0.0.1-${branch_name}" - echo "new_version=$new_version" >> $GITHUB_ENV - echo "new_version=$new_version" >> $GITHUB_OUTPUT - exit 0 + new_version="$major.$minor.$patch-${branch_name}" fi - new_version="$major.$minor.$patch" while git rev-parse "refs/tags/$new_version" >/dev/null 2>&1; do patch=$((patch + 1)) - new_version="$major.$minor.$patch" + new_version="$major.$minor.$patch-${branch_name}" done echo "New version: $new_version" echo "new_version=$new_version" >> $GITHUB_ENV From bfd0d9bad2b9b86eb5a935d6ad2eae169e19e8aa Mon Sep 17 00:00:00 2001 From: Matlavv Date: Wed, 20 Nov 2024 16:34:35 +0100 Subject: [PATCH 111/114] Trying to update helm chart version --- .github/workflows/ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 18e9088..57b5275 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -169,10 +169,11 @@ jobs: - name: Package Helm chart run: | - helm package opensource + new_version=${{ needs.determine-version.outputs.new_version }} + sed -i.bak 's/^version:.*/version: '"$new_version"'/g' ${{ env.CHART_PATH }}/Chart.yaml + helm package ${{ env.CHART_PATH }} - name: Push Helm chart to Docker Hub run: | - echo "Pushing Helm chart to Docker Hub with version ${{ needs.determine-version.outputs.new_version }}" - echo "pushing with version '${{ needs.determine-version.outputs.new_version }}'" - helm push $(ls *.tgz) oci://registry-1.docker.io/bouyguestelecomcharts --version ${{ needs.determine-version.outputs.new_version }} + new_version=${{ needs.determine-version.outputs.new_version }} + helm push $(ls *.tgz) oci://registry-1.docker.io/bouyguestelecomcharts --version "$new_version" From de518b2db664a9feea2e6ef56bed19d306ad89b5 Mon Sep 17 00:00:00 2001 From: Matlavv Date: Wed, 20 Nov 2024 17:15:08 +0100 Subject: [PATCH 112/114] Upload helm with defined version --- .github/workflows/ci.yml | 7 ++----- opensource/Chart.yaml | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 57b5275..47a4869 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -169,11 +169,8 @@ jobs: - name: Package Helm chart run: | - new_version=${{ needs.determine-version.outputs.new_version }} - sed -i.bak 's/^version:.*/version: '"$new_version"'/g' ${{ env.CHART_PATH }}/Chart.yaml - helm package ${{ env.CHART_PATH }} + helm package opensource - name: Push Helm chart to Docker Hub run: | - new_version=${{ needs.determine-version.outputs.new_version }} - helm push $(ls *.tgz) oci://registry-1.docker.io/bouyguestelecomcharts --version "$new_version" + helm push $(ls *.tgz) oci://registry-1.docker.io/bouyguestelecomcharts diff --git a/opensource/Chart.yaml b/opensource/Chart.yaml index 54a2b25..fcd0676 100644 --- a/opensource/Chart.yaml +++ b/opensource/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: tada description: TADA 🎉 - Transform And Deliver Assets - Bouygues Telecom type: application -version: '0.1.0' -appVersion: '0.1.0' +version: '0.1.1' +appVersion: '0.1.1' From 141e6e1f3ace8e0e41a2ca730f807b1f7ecd889e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Am=C3=A9lie=20Loulergue?= Date: Thu, 21 Nov 2024 10:56:46 +0100 Subject: [PATCH 113/114] add determine-version in needs --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 47a4869..f3be1a8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -146,6 +146,7 @@ jobs: publish-helm-chart: runs-on: ubuntu-latest needs: + - determine-version - build-and-push-docker-api - build-and-push-docker-job @@ -169,7 +170,7 @@ jobs: - name: Package Helm chart run: | - helm package opensource + helm package opensource --version "${{ needs.determine-version.outputs.new_version }}" - name: Push Helm chart to Docker Hub run: | From 3861e64bdf8eb22453eb4b52d212939c8971a8b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Am=C3=A9lie=20Loulergue?= Date: Thu, 21 Nov 2024 11:10:17 +0100 Subject: [PATCH 114/114] update branch push to main in worflow --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f3be1a8..07c1e05 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,7 +3,7 @@ name: CI Docker and Helm on: push: branches: - - workflow/api-improve + - main env: IMAGE_NAME: bouyguestelecom/tada