From 807241e0fffc52eea0ec5ee8c615b4e8bdcd1de0 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Fri, 15 Nov 2024 15:27:44 +0100 Subject: [PATCH 1/3] change repo url --- .github/workflows/build-single-product-part.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-single-product-part.yml b/.github/workflows/build-single-product-part.yml index 0b64fa2f..d82e7449 100644 --- a/.github/workflows/build-single-product-part.yml +++ b/.github/workflows/build-single-product-part.yml @@ -142,7 +142,7 @@ jobs: cd "./tmp/$COMPONENT" repository="$REPO" if [[ $repository == *"gitlab"* && -n $GITLAB_TOKEN ]] ; then - repository=${repository/"https://"/"https://$GITLAB_TOKEN@"} + repository=https://$GITLAB_TOKEN@${repository}} else repository=https://$GH_TOKEN@github.com/${repository}.git fi From 27e346bf5426d6f873698439ef42760bf3d8985b Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Fri, 15 Nov 2024 15:29:12 +0100 Subject: [PATCH 2/3] switch branches --- .github/workflows/build-node-python.yml | 2 +- .github/workflows/build-node.yml | 2 +- .github/workflows/build-product.yml | 6 +++--- .github/workflows/build-push-docker.yml | 2 +- .github/workflows/build-push-helm-chart.yml | 2 +- .github/workflows/build-python.yml | 2 +- .github/workflows/build-single-product-part.yml | 2 +- .github/workflows/build-workspace-product-part.yml | 2 +- .github/workflows/check-helm-chart-version.yml | 2 +- .github/workflows/deploy-product.yml | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-node-python.yml b/.github/workflows/build-node-python.yml index 77dabb41..a6f8d386 100644 --- a/.github/workflows/build-node-python.yml +++ b/.github/workflows/build-node-python.yml @@ -102,7 +102,7 @@ env: PYPI_REGISTRY: "https://upload.pypi.org/legacy/" PYPI_USERNAME: "datavisyn" PYTHON_VERSION: "3.10" - WORKFLOW_BRANCH: "main" + WORKFLOW_BRANCH: "vstoiber-gitlab" POSTGRES_HOSTNAME: postgres_${{ github.job }}_${{ inputs.deduplication_id }}_${{ github.run_id }}_${{ github.run_attempt }} permissions: diff --git a/.github/workflows/build-node.yml b/.github/workflows/build-node.yml index ed0c9620..688e5dfc 100644 --- a/.github/workflows/build-node.yml +++ b/.github/workflows/build-node.yml @@ -32,7 +32,7 @@ on: env: NPM_REGISTRY: "https://registry.npmjs.org/" NODE_VERSION: "20.9" - WORKFLOW_BRANCH: "main" + WORKFLOW_BRANCH: "vstoiber-gitlab" permissions: contents: read diff --git a/.github/workflows/build-product.yml b/.github/workflows/build-product.yml index 7eb92d39..f4323dff 100644 --- a/.github/workflows/build-product.yml +++ b/.github/workflows/build-product.yml @@ -27,7 +27,7 @@ env: TIME_ZONE: "Europe/Vienna" NODE_VERSION: "20.9" PYTHON_VERSION: "3.10" - WORKFLOW_BRANCH: "main" + WORKFLOW_BRANCH: "vstoiber-gitlab" PYTHON_BASE_IMAGE: "python:3.10.8-slim-bullseye" DATAVISYN_PYTHON_BASE_IMAGE: "188237246440.dkr.ecr.eu-central-1.amazonaws.com/datavisyn/base/python:main" DATAVISYN_NGINX_BASE_IMAGE: "188237246440.dkr.ecr.eu-central-1.amazonaws.com/datavisyn/base/nginx:main" @@ -90,7 +90,7 @@ jobs: fail-fast: true matrix: component: ${{fromJson(needs.prepare-build.outputs.components)}} - uses: datavisyn/github-workflows/.github/workflows/build-single-product-part.yml@main + uses: datavisyn/github-workflows/.github/workflows/build-single-product-part.yml@vstoiber-gitlab with: component: ${{ matrix.component }} image_tag1: ${{ needs.prepare-build.outputs.image_tag1 }} @@ -105,7 +105,7 @@ jobs: fail-fast: true matrix: component: ${{fromJson(needs.prepare-build.outputs.components)}} - uses: datavisyn/github-workflows/.github/workflows/build-workspace-product-part.yml@main + uses: datavisyn/github-workflows/.github/workflows/build-workspace-product-part.yml@vstoiber-gitlab with: component: ${{ matrix.component }} image_tag1: ${{ needs.prepare-build.outputs.image_tag1 }} diff --git a/.github/workflows/build-push-docker.yml b/.github/workflows/build-push-docker.yml index dbbbd21b..b001095b 100644 --- a/.github/workflows/build-push-docker.yml +++ b/.github/workflows/build-push-docker.yml @@ -28,7 +28,7 @@ permissions: contents: read env: - WORKFLOW_BRANCH: "main" + WORKFLOW_BRANCH: "vstoiber-gitlab" jobs: build: diff --git a/.github/workflows/build-push-helm-chart.yml b/.github/workflows/build-push-helm-chart.yml index ff0e3ce5..56f14323 100644 --- a/.github/workflows/build-push-helm-chart.yml +++ b/.github/workflows/build-push-helm-chart.yml @@ -22,7 +22,7 @@ permissions: contents: read env: - WORKFLOW_BRANCH: "main" + WORKFLOW_BRANCH: "vstoiber-gitlab" concurrency: group: '${{ github.workflow }}-${{ github.ref || github.head_ref }}' diff --git a/.github/workflows/build-python.yml b/.github/workflows/build-python.yml index ffd4e4c5..933c55c2 100644 --- a/.github/workflows/build-python.yml +++ b/.github/workflows/build-python.yml @@ -21,7 +21,7 @@ env: PYPI_REGISTRY: "https://upload.pypi.org/legacy/" PYPI_USERNAME: "test" PYTHON_VERSION: "3.10" - WORKFLOW_BRANCH: "main" + WORKFLOW_BRANCH: "vstoiber-gitlab" permissions: contents: read diff --git a/.github/workflows/build-single-product-part.yml b/.github/workflows/build-single-product-part.yml index d82e7449..0d8833a4 100644 --- a/.github/workflows/build-single-product-part.yml +++ b/.github/workflows/build-single-product-part.yml @@ -45,7 +45,7 @@ env: TIME_ZONE: "Europe/Vienna" NODE_VERSION: "20.9" PYTHON_VERSION: "3.10" - WORKFLOW_BRANCH: "main" + WORKFLOW_BRANCH: "vstoiber-gitlab" PYTHON_BASE_IMAGE: "python:3.10.8-slim-bullseye" DATAVISYN_PYTHON_BASE_IMAGE: "188237246440.dkr.ecr.eu-central-1.amazonaws.com/datavisyn/base/python:main" DATAVISYN_NGINX_BASE_IMAGE: "188237246440.dkr.ecr.eu-central-1.amazonaws.com/datavisyn/base/nginx:main" diff --git a/.github/workflows/build-workspace-product-part.yml b/.github/workflows/build-workspace-product-part.yml index a3de2964..7f5cff28 100644 --- a/.github/workflows/build-workspace-product-part.yml +++ b/.github/workflows/build-workspace-product-part.yml @@ -43,7 +43,7 @@ env: TIME_ZONE: "Europe/Vienna" NODE_VERSION: "20.9" PYTHON_VERSION: "3.10" - WORKFLOW_BRANCH: "main" + WORKFLOW_BRANCH: "vstoiber-gitlab" PYTHON_BASE_IMAGE: "python:3.10.8-slim-bullseye" DATAVISYN_PYTHON_BASE_IMAGE: "188237246440.dkr.ecr.eu-central-1.amazonaws.com/datavisyn/base/python:main" DATAVISYN_NGINX_BASE_IMAGE: "188237246440.dkr.ecr.eu-central-1.amazonaws.com/datavisyn/base/nginx:main" diff --git a/.github/workflows/check-helm-chart-version.yml b/.github/workflows/check-helm-chart-version.yml index d5e3f2e8..639fd88d 100644 --- a/.github/workflows/check-helm-chart-version.yml +++ b/.github/workflows/check-helm-chart-version.yml @@ -23,7 +23,7 @@ permissions: contents: read env: - WORKFLOW_BRANCH: "main" + WORKFLOW_BRANCH: "vstoiber-gitlab" jobs: check-helm-chart-version: diff --git a/.github/workflows/deploy-product.yml b/.github/workflows/deploy-product.yml index f7692bfc..6e4f35fd 100644 --- a/.github/workflows/deploy-product.yml +++ b/.github/workflows/deploy-product.yml @@ -38,7 +38,7 @@ concurrency: env: GA_VERSION: "main" - WORKFLOW_BRANCH: "main" + WORKFLOW_BRANCH: "vstoiber-gitlab" jobs: deploy: From b1e29c2ea938ea040ef158c549bac7c57afd14e1 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Fri, 15 Nov 2024 15:31:48 +0100 Subject: [PATCH 3/3] fix lint --- .github/workflows/build-single-product-part.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-single-product-part.yml b/.github/workflows/build-single-product-part.yml index 0d8833a4..8c4e41bf 100644 --- a/.github/workflows/build-single-product-part.yml +++ b/.github/workflows/build-single-product-part.yml @@ -142,7 +142,7 @@ jobs: cd "./tmp/$COMPONENT" repository="$REPO" if [[ $repository == *"gitlab"* && -n $GITLAB_TOKEN ]] ; then - repository=https://$GITLAB_TOKEN@${repository}} + repository=https://$GITLAB_TOKEN@${repository} else repository=https://$GH_TOKEN@github.com/${repository}.git fi