From 53f115327a03b24a3764281ebb724b460ab89362 Mon Sep 17 00:00:00 2001 From: Piotr Pawlowski Date: Thu, 28 Sep 2023 17:49:20 +0200 Subject: [PATCH 1/5] Reusabne workflow reference name change --- .github/workflows/build-containers.yml | 20 ++++++++++---------- .github/workflows/fileserver-container.yml | 8 ++++---- .github/workflows/flowforge-container.yml | 8 ++++---- .github/workflows/nodered-container.yml | 6 +++--- .github/workflows/project-automation.yml | 2 +- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/build-containers.yml b/.github/workflows/build-containers.yml index a086686a..dd774404 100644 --- a/.github/workflows/build-containers.yml +++ b/.github/workflows/build-containers.yml @@ -9,7 +9,7 @@ jobs: steps: - uses: actions/checkout@v3 with: - repository: 'flowforge/helm' + repository: 'flowfuse/helm' path: 'helm' # sets options for Docker build # will tag contianers with GH tag name @@ -22,7 +22,7 @@ jobs: flavor: | latest=true images: | - flowforge/forge-k8s + flowfuse/forge-k8s # sets up multi platform emulators - name: Setup QEMU uses: docker/setup-qemu-action@v1 @@ -50,14 +50,14 @@ jobs: repository: flowforge/forge-k8s username: flowforge password: ${{ secrets.DOCKER_HUB_PASSWORD }} - readme-filepath: ./helm/flowforge-container/README.md + readme-filepath: ./helm/flowfuse-container/README.md build_nodered_container: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 with: - repository: 'flowforge/helm' + repository: 'flowfuse/helm' path: 'helm' - name: Docker Meta Data id: meta @@ -99,7 +99,7 @@ jobs: steps: - uses: actions/checkout@v3 with: - repository: 'flowforge/helm' + repository: 'flowfuse/helm' path: 'helm' - name: Docker Meta Data id: meta @@ -134,7 +134,7 @@ jobs: steps: - uses: actions/checkout@v3 with: - repository: 'flowforge/helm' + repository: 'flowfuse/helm' path: 'helm' - name: Docker Meta Data id: meta @@ -169,7 +169,7 @@ jobs: steps: - uses: actions/checkout@v3 with: - repository: 'flowforge/helm' + repository: 'flowfuse/helm' path: 'helm' - name: Docker Meta Data id: meta @@ -220,7 +220,7 @@ jobs: - name: Checkout uses: actions/checkout@v3 with: - repository: 'flowforge/helm' + repository: 'flowfuse/helm' fetch-depth: 0 path: 'helm' - name: Package @@ -229,9 +229,9 @@ jobs: cd helm git checkout gh-pages mv ../flowforge-*.tgz . - helm repo index --url https://flowforge.github.io/helm . + helm repo index --url https://flowfuse.github.io/helm . git add . - git -c user.name='FlowForge Build Bot' -c user.email='noreply@flowforge.com' commit -m "Add ${{ github.ref_name }} helm chart" + git -c user.name='FlowFuse Build Bot' -c user.email='noreply@flowfuse.com' commit -m "Add ${{ github.ref_name }} helm chart" git push origin - name: Resync Maintenance if: ${{ endsWith(github.ref, '.0') }} diff --git a/.github/workflows/fileserver-container.yml b/.github/workflows/fileserver-container.yml index db2c7e8b..aca5a4ac 100644 --- a/.github/workflows/fileserver-container.yml +++ b/.github/workflows/fileserver-container.yml @@ -23,7 +23,7 @@ concurrency: jobs: build: name: Build single-architecture container images - uses: flowforge/github-actions-workflows/.github/workflows/build_container_image.yml@cc8efbe5e4897e997d3b170a970a1afca9410273 + uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@cc8efbe5e4897e997d3b170a970a1afca9410273 with: image_name: 'file-server' package_dependencies: | @@ -37,7 +37,7 @@ jobs: build-multi-architecture: name: Build multi-architecture container image needs: build - uses: flowforge/github-actions-workflows/.github/workflows/merge_multiarch_images.yml@cc8efbe5e4897e997d3b170a970a1afca9410273 + uses: flowfuse/github-actions-workflows/.github/workflows/merge_multiarch_images.yml@cc8efbe5e4897e997d3b170a970a1afca9410273 with: image_name: 'file-server' secrets: @@ -46,7 +46,7 @@ jobs: deploy-stage: name: Deploy to staging environment needs: build-multi-architecture - uses: flowforge/github-actions-workflows/.github/workflows/deploy_container_image.yml@cc8efbe5e4897e997d3b170a970a1afca9410273 + uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@cc8efbe5e4897e997d3b170a970a1afca9410273 with: environment: stage service_name: 'file-server' @@ -63,7 +63,7 @@ jobs: if: github.ref_name == 'main' name: Deploy to production environment needs: [build-multi-architecture, deploy-stage] - uses: flowforge/github-actions-workflows/.github/workflows/deploy_container_image.yml@cc8efbe5e4897e997d3b170a970a1afca9410273 + uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@cc8efbe5e4897e997d3b170a970a1afca9410273 with: environment: production service_name: 'file-server' diff --git a/.github/workflows/flowforge-container.yml b/.github/workflows/flowforge-container.yml index 2ef94f95..04082ece 100644 --- a/.github/workflows/flowforge-container.yml +++ b/.github/workflows/flowforge-container.yml @@ -23,7 +23,7 @@ concurrency: jobs: build: name: Build single-architecture container images - uses: flowforge/github-actions-workflows/.github/workflows/build_container_image.yml@cc8efbe5e4897e997d3b170a970a1afca9410273 + uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@cc8efbe5e4897e997d3b170a970a1afca9410273 with: image_name: 'forge-k8s' package_dependencies: | @@ -38,7 +38,7 @@ jobs: build-multi-architecture: name: Build multi-architecture container image needs: build - uses: flowforge/github-actions-workflows/.github/workflows/merge_multiarch_images.yml@cc8efbe5e4897e997d3b170a970a1afca9410273 + uses: flowfuse/github-actions-workflows/.github/workflows/merge_multiarch_images.yml@cc8efbe5e4897e997d3b170a970a1afca9410273 with: image_name: 'forge-k8s' secrets: @@ -47,7 +47,7 @@ jobs: deploy-stage: name: Deploy to staging environment needs: build-multi-architecture - uses: flowforge/github-actions-workflows/.github/workflows/deploy_container_image.yml@cc8efbe5e4897e997d3b170a970a1afca9410273 + uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@cc8efbe5e4897e997d3b170a970a1afca9410273 with: environment: stage service_name: 'forge-k8s' @@ -64,7 +64,7 @@ jobs: if: github.ref_name == 'main' name: Deploy to production environment needs: [build-multi-architecture, deploy-stage] - uses: flowforge/github-actions-workflows/.github/workflows/deploy_container_image.yml@cc8efbe5e4897e997d3b170a970a1afca9410273 + uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@cc8efbe5e4897e997d3b170a970a1afca9410273 with: environment: production service_name: 'forge-k8s' diff --git a/.github/workflows/nodered-container.yml b/.github/workflows/nodered-container.yml index f418b06f..70c5cb9d 100644 --- a/.github/workflows/nodered-container.yml +++ b/.github/workflows/nodered-container.yml @@ -22,7 +22,7 @@ concurrency: jobs: build-stage-302: - uses: flowforge/github-actions-workflows/.github/workflows/build_container_image.yml@e3e734b910af78371b2c9a1c6856446d17421f50 + uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@e3e734b910af78371b2c9a1c6856446d17421f50 with: environment: 'stage' image_name: 'node-red' @@ -36,7 +36,7 @@ jobs: aws_access_key_id: ${{ secrets.STAGING_AWS_ID }} aws_access_key_secret: ${{ secrets.STAGING_AWS_KEY }} build-stage-223: - uses: flowforge/github-actions-workflows/.github/workflows/build_container_image.yml@e3e734b910af78371b2c9a1c6856446d17421f50 + uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@e3e734b910af78371b2c9a1c6856446d17421f50 with: environment: 'stage' image_name: 'node-red' @@ -51,7 +51,7 @@ jobs: aws_access_key_id: ${{ secrets.STAGING_AWS_ID }} aws_access_key_secret: ${{ secrets.STAGING_AWS_KEY }} build-stage-310: - uses: flowforge/github-actions-workflows/.github/workflows/build_container_image.yml@e3e734b910af78371b2c9a1c6856446d17421f50 + uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@e3e734b910af78371b2c9a1c6856446d17421f50 with: environment: 'stage' image_name: 'node-red' diff --git a/.github/workflows/project-automation.yml b/.github/workflows/project-automation.yml index ab8ccf7e..4d09e567 100644 --- a/.github/workflows/project-automation.yml +++ b/.github/workflows/project-automation.yml @@ -5,6 +5,6 @@ on: - opened jobs: add_to_product_board: - uses: flowforge/.github/.github/workflows/project-automation.yml@main + uses: flowfuse/.github/.github/workflows/project-automation.yml@main secrets: token: ${{ secrets.PROJECT_ACCESS_TOKEN }} From b7f1594ef028a8e232e0d675978c99a3541630f6 Mon Sep 17 00:00:00 2001 From: Piotr Pawlowski Date: Thu, 28 Sep 2023 18:07:07 +0200 Subject: [PATCH 2/5] Test lowercase fix --- .github/workflows/fileserver-container.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/fileserver-container.yml b/.github/workflows/fileserver-container.yml index aca5a4ac..60d1e541 100644 --- a/.github/workflows/fileserver-container.yml +++ b/.github/workflows/fileserver-container.yml @@ -23,7 +23,7 @@ concurrency: jobs: build: name: Build single-architecture container images - uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@cc8efbe5e4897e997d3b170a970a1afca9410273 + uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@fix-lower-repo-owner with: image_name: 'file-server' package_dependencies: | @@ -37,7 +37,7 @@ jobs: build-multi-architecture: name: Build multi-architecture container image needs: build - uses: flowfuse/github-actions-workflows/.github/workflows/merge_multiarch_images.yml@cc8efbe5e4897e997d3b170a970a1afca9410273 + uses: flowfuse/github-actions-workflows/.github/workflows/merge_multiarch_images.yml@fix-lower-repo-owner with: image_name: 'file-server' secrets: From 5d8dcf99e54c62f547d30572a90a8a4f57048ea2 Mon Sep 17 00:00:00 2001 From: Piotr Pawlowski Date: Thu, 28 Sep 2023 18:31:17 +0200 Subject: [PATCH 3/5] Bump container build reusable workflow version --- .github/workflows/fileserver-container.yml | 8 ++++---- .github/workflows/flowforge-container.yml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/fileserver-container.yml b/.github/workflows/fileserver-container.yml index 60d1e541..1dbfea1b 100644 --- a/.github/workflows/fileserver-container.yml +++ b/.github/workflows/fileserver-container.yml @@ -23,7 +23,7 @@ concurrency: jobs: build: name: Build single-architecture container images - uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@fix-lower-repo-owner + uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@7808b849474ae9bc8dfc7f6db19e66d241018c94 with: image_name: 'file-server' package_dependencies: | @@ -37,7 +37,7 @@ jobs: build-multi-architecture: name: Build multi-architecture container image needs: build - uses: flowfuse/github-actions-workflows/.github/workflows/merge_multiarch_images.yml@fix-lower-repo-owner + uses: flowfuse/github-actions-workflows/.github/workflows/merge_multiarch_images.yml@7808b849474ae9bc8dfc7f6db19e66d241018c94 with: image_name: 'file-server' secrets: @@ -46,7 +46,7 @@ jobs: deploy-stage: name: Deploy to staging environment needs: build-multi-architecture - uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@cc8efbe5e4897e997d3b170a970a1afca9410273 + uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@7808b849474ae9bc8dfc7f6db19e66d241018c94 with: environment: stage service_name: 'file-server' @@ -63,7 +63,7 @@ jobs: if: github.ref_name == 'main' name: Deploy to production environment needs: [build-multi-architecture, deploy-stage] - uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@cc8efbe5e4897e997d3b170a970a1afca9410273 + uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@7808b849474ae9bc8dfc7f6db19e66d241018c94 with: environment: production service_name: 'file-server' diff --git a/.github/workflows/flowforge-container.yml b/.github/workflows/flowforge-container.yml index 04082ece..62a48dbd 100644 --- a/.github/workflows/flowforge-container.yml +++ b/.github/workflows/flowforge-container.yml @@ -23,7 +23,7 @@ concurrency: jobs: build: name: Build single-architecture container images - uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@cc8efbe5e4897e997d3b170a970a1afca9410273 + uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@7808b849474ae9bc8dfc7f6db19e66d241018c94 with: image_name: 'forge-k8s' package_dependencies: | @@ -38,7 +38,7 @@ jobs: build-multi-architecture: name: Build multi-architecture container image needs: build - uses: flowfuse/github-actions-workflows/.github/workflows/merge_multiarch_images.yml@cc8efbe5e4897e997d3b170a970a1afca9410273 + uses: flowfuse/github-actions-workflows/.github/workflows/merge_multiarch_images.yml@7808b849474ae9bc8dfc7f6db19e66d241018c94 with: image_name: 'forge-k8s' secrets: @@ -47,7 +47,7 @@ jobs: deploy-stage: name: Deploy to staging environment needs: build-multi-architecture - uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@cc8efbe5e4897e997d3b170a970a1afca9410273 + uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@7808b849474ae9bc8dfc7f6db19e66d241018c94 with: environment: stage service_name: 'forge-k8s' @@ -64,7 +64,7 @@ jobs: if: github.ref_name == 'main' name: Deploy to production environment needs: [build-multi-architecture, deploy-stage] - uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@cc8efbe5e4897e997d3b170a970a1afca9410273 + uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@7808b849474ae9bc8dfc7f6db19e66d241018c94 with: environment: production service_name: 'forge-k8s' From 18d0cf866332d69e7b1a15375c8e05a2d49419e7 Mon Sep 17 00:00:00 2001 From: Piotr Pawlowski Date: Thu, 28 Sep 2023 18:32:43 +0200 Subject: [PATCH 4/5] Fix image registry name --- .github/workflows/build-containers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-containers.yml b/.github/workflows/build-containers.yml index dd774404..771fb9e8 100644 --- a/.github/workflows/build-containers.yml +++ b/.github/workflows/build-containers.yml @@ -22,7 +22,7 @@ jobs: flavor: | latest=true images: | - flowfuse/forge-k8s + flowforge/forge-k8s # sets up multi platform emulators - name: Setup QEMU uses: docker/setup-qemu-action@v1 From 5f7c4d05eb43c2f0df530ff31c1beaf0ebbb9129 Mon Sep 17 00:00:00 2001 From: Piotr Pawlowski Date: Thu, 28 Sep 2023 18:34:40 +0200 Subject: [PATCH 5/5] Fix directory rename --- .github/workflows/build-containers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-containers.yml b/.github/workflows/build-containers.yml index 771fb9e8..29708507 100644 --- a/.github/workflows/build-containers.yml +++ b/.github/workflows/build-containers.yml @@ -50,7 +50,7 @@ jobs: repository: flowforge/forge-k8s username: flowforge password: ${{ secrets.DOCKER_HUB_PASSWORD }} - readme-filepath: ./helm/flowfuse-container/README.md + readme-filepath: ./helm/flowforge-container/README.md build_nodered_container: runs-on: ubuntu-latest