From 93500e528f82fd1f2bb011afacb88fed1adf5d9f Mon Sep 17 00:00:00 2001 From: "rafal.gorecki" Date: Mon, 7 Apr 2025 16:17:33 +0200 Subject: [PATCH 1/4] Use organisation PAT --- .github/workflows/release-candidate.yaml | 6 +++--- .github/workflows/release-project.yaml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release-candidate.yaml b/.github/workflows/release-candidate.yaml index 16a547c14..8b0d4d241 100644 --- a/.github/workflows/release-candidate.yaml +++ b/.github/workflows/release-candidate.yaml @@ -24,7 +24,7 @@ jobs: with: owner: husarion repo: docs_new - github_token: ${{ secrets.RAFAL_ACCESS_TOKEN }} + github_token: ${{ secrets.GH_PAT }} workflow_file_name: test-parser.yaml ref: master client_payload: '{"husarion_ugv_branch": "ros2-devel"}' @@ -75,14 +75,14 @@ jobs: repository_name: husarion-ugv-rpi-os-img new_branch_name: ${{ env.RC_BRANCH_NAME }} new_branch_ref: ros2-devel - access_token: ${{ secrets.RAFAL_ACCESS_TOKEN}} + access_token: ${{ secrets.GH_PAT}} - name: Build OS image uses: convictional/trigger-workflow-and-wait@v1.6.5 with: owner: husarion repo: husarion-ugv-rpi-os-img - github_token: ${{ secrets.RAFAL_ACCESS_TOKEN }} + github_token: ${{ secrets.GH_PAT }} workflow_file_name: build_and_deploy_image.yaml ref: ${{ env.RC_BRANCH_NAME }} client_payload: | diff --git a/.github/workflows/release-project.yaml b/.github/workflows/release-project.yaml index 257b294d1..d80545269 100644 --- a/.github/workflows/release-project.yaml +++ b/.github/workflows/release-project.yaml @@ -65,7 +65,7 @@ jobs: with: owner: husarion repo: husarion-ugv-rpi-os-img - github_token: ${{ secrets.RAFAL_ACCESS_TOKEN }} + github_token: ${{ secrets.GH_PAT }} workflow_file_name: release-repository.yaml ref: ${{ env.RC_BRANCH_NAME }} client_payload: | @@ -82,7 +82,7 @@ jobs: with: owner: husarion repo: husarion-ugv-rpi-os-img - github_token: ${{ secrets.RAFAL_ACCESS_TOKEN }} + github_token: ${{ secrets.GH_PAT }} workflow_file_name: build_and_deploy_image.yaml ref: ${{ env.MAIN_BRANCH }} client_payload: | @@ -101,6 +101,6 @@ jobs: with: owner: husarion repo: docs_new - github_token: ${{ secrets.RAFAL_ACCESS_TOKEN }} + github_token: ${{ secrets.GH_PAT }} workflow_file_name: build.yaml ref: master From 0182bc138e71f72fec1c04994b64644d44ed875a Mon Sep 17 00:00:00 2001 From: "rafal.gorecki" Date: Mon, 7 Apr 2025 16:44:05 +0200 Subject: [PATCH 2/4] test --- .github/workflows/release-candidate.yaml | 86 ++++++++++++------------ 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/.github/workflows/release-candidate.yaml b/.github/workflows/release-candidate.yaml index 8b0d4d241..c2dc70e99 100644 --- a/.github/workflows/release-candidate.yaml +++ b/.github/workflows/release-candidate.yaml @@ -29,39 +29,39 @@ jobs: ref: master client_payload: '{"husarion_ugv_branch": "ros2-devel"}' - unit_tests: - name: Unit tests - uses: ./.github/workflows/run-unit-tests.yaml + # unit_tests: + # name: Unit tests + # uses: ./.github/workflows/run-unit-tests.yaml - update_compose_files: - name: Update compose files - needs: unit_tests - runs-on: ubuntu-22.04 - steps: - - name: Checkout - uses: actions/checkout@v4 + # update_compose_files: + # name: Update compose files + # needs: unit_tests + # runs-on: ubuntu-22.04 + # steps: + # - name: Checkout + # uses: actions/checkout@v4 - - name: Update docker image tag - run: | - sed -i 's/\(husarion\/husarion-ugv:humble-\)[^[:space:]]*/\1${{ env.RC_BRANCH_NAME }}/g' docker/demo/compose.hardware.yaml - sed -i 's/\(husarion\/husarion-ugv:humble-\)[^[:space:]]*/\1${{ env.RC_BRANCH_NAME }}/g' docker/demo/compose.rviz.yaml - sed -i 's/\(husarion\/husarion-ugv-gazebo:humble-\)[^[:space:]]*/\1${{ env.RC_BRANCH_NAME }}/g' docker/demo/compose.simulation.yaml + # - name: Update docker image tag + # run: | + # sed -i 's/\(husarion\/husarion-ugv:humble-\)[^[:space:]]*/\1${{ env.RC_BRANCH_NAME }}/g' docker/demo/compose.hardware.yaml + # sed -i 's/\(husarion\/husarion-ugv:humble-\)[^[:space:]]*/\1${{ env.RC_BRANCH_NAME }}/g' docker/demo/compose.rviz.yaml + # sed -i 's/\(husarion\/husarion-ugv-gazebo:humble-\)[^[:space:]]*/\1${{ env.RC_BRANCH_NAME }}/g' docker/demo/compose.simulation.yaml - - name: Commit changes - uses: EndBug/add-and-commit@v9 - with: - message: Update tags in compose files - author_name: action-bot - author_email: action-bot@action-bot.com - new_branch: ${{ env.RC_BRANCH_NAME }} + # - name: Commit changes + # uses: EndBug/add-and-commit@v9 + # with: + # message: Update tags in compose files + # author_name: action-bot + # author_email: action-bot@action-bot.com + # new_branch: ${{ env.RC_BRANCH_NAME }} - build_docker: - name: Build Docker - needs: update_compose_files - uses: ./.github/workflows/build-docker.yaml - with: - build_type: development - secrets: inherit + # build_docker: + # name: Build Docker + # needs: update_compose_files + # uses: ./.github/workflows/build-docker.yaml + # with: + # build_type: development + # secrets: inherit os_image: name: OS image @@ -77,17 +77,17 @@ jobs: new_branch_ref: ros2-devel access_token: ${{ secrets.GH_PAT}} - - name: Build OS image - uses: convictional/trigger-workflow-and-wait@v1.6.5 - with: - owner: husarion - repo: husarion-ugv-rpi-os-img - github_token: ${{ secrets.GH_PAT }} - workflow_file_name: build_and_deploy_image.yaml - ref: ${{ env.RC_BRANCH_NAME }} - client_payload: | - { - "dev_image": "true", - "husarion_ugv_version": "${{ env.RC_BRANCH_NAME }}", - "image_tag": "${{ inputs.version }}" - } + # - name: Build OS image + # uses: convictional/trigger-workflow-and-wait@v1.6.5 + # with: + # owner: husarion + # repo: husarion-ugv-rpi-os-img + # github_token: ${{ secrets.GH_PAT }} + # workflow_file_name: build_and_deploy_image.yaml + # ref: ${{ env.RC_BRANCH_NAME }} + # client_payload: | + # { + # "dev_image": "true", + # "husarion_ugv_version": "${{ env.RC_BRANCH_NAME }}", + # "image_tag": "${{ inputs.version }}" + # } From 8b76823a47d76f3db086290dd78428496f3639ce Mon Sep 17 00:00:00 2001 From: "rafal.gorecki" Date: Mon, 7 Apr 2025 16:45:38 +0200 Subject: [PATCH 3/4] fix test --- .github/workflows/release-candidate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-candidate.yaml b/.github/workflows/release-candidate.yaml index c2dc70e99..7f22f9480 100644 --- a/.github/workflows/release-candidate.yaml +++ b/.github/workflows/release-candidate.yaml @@ -65,7 +65,7 @@ jobs: os_image: name: OS image - needs: update_compose_files + # needs: update_compose_files runs-on: ubuntu-22.04 steps: - name: Create new branch From 9388a1a3c90712ff06db83382b5e2a405712188a Mon Sep 17 00:00:00 2001 From: "rafal.gorecki" Date: Mon, 7 Apr 2025 16:48:17 +0200 Subject: [PATCH 4/4] Test pass - revert changes --- .github/workflows/release-candidate.yaml | 88 ++++++++++++------------ 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/.github/workflows/release-candidate.yaml b/.github/workflows/release-candidate.yaml index 7f22f9480..8b0d4d241 100644 --- a/.github/workflows/release-candidate.yaml +++ b/.github/workflows/release-candidate.yaml @@ -29,43 +29,43 @@ jobs: ref: master client_payload: '{"husarion_ugv_branch": "ros2-devel"}' - # unit_tests: - # name: Unit tests - # uses: ./.github/workflows/run-unit-tests.yaml + unit_tests: + name: Unit tests + uses: ./.github/workflows/run-unit-tests.yaml - # update_compose_files: - # name: Update compose files - # needs: unit_tests - # runs-on: ubuntu-22.04 - # steps: - # - name: Checkout - # uses: actions/checkout@v4 + update_compose_files: + name: Update compose files + needs: unit_tests + runs-on: ubuntu-22.04 + steps: + - name: Checkout + uses: actions/checkout@v4 - # - name: Update docker image tag - # run: | - # sed -i 's/\(husarion\/husarion-ugv:humble-\)[^[:space:]]*/\1${{ env.RC_BRANCH_NAME }}/g' docker/demo/compose.hardware.yaml - # sed -i 's/\(husarion\/husarion-ugv:humble-\)[^[:space:]]*/\1${{ env.RC_BRANCH_NAME }}/g' docker/demo/compose.rviz.yaml - # sed -i 's/\(husarion\/husarion-ugv-gazebo:humble-\)[^[:space:]]*/\1${{ env.RC_BRANCH_NAME }}/g' docker/demo/compose.simulation.yaml + - name: Update docker image tag + run: | + sed -i 's/\(husarion\/husarion-ugv:humble-\)[^[:space:]]*/\1${{ env.RC_BRANCH_NAME }}/g' docker/demo/compose.hardware.yaml + sed -i 's/\(husarion\/husarion-ugv:humble-\)[^[:space:]]*/\1${{ env.RC_BRANCH_NAME }}/g' docker/demo/compose.rviz.yaml + sed -i 's/\(husarion\/husarion-ugv-gazebo:humble-\)[^[:space:]]*/\1${{ env.RC_BRANCH_NAME }}/g' docker/demo/compose.simulation.yaml - # - name: Commit changes - # uses: EndBug/add-and-commit@v9 - # with: - # message: Update tags in compose files - # author_name: action-bot - # author_email: action-bot@action-bot.com - # new_branch: ${{ env.RC_BRANCH_NAME }} + - name: Commit changes + uses: EndBug/add-and-commit@v9 + with: + message: Update tags in compose files + author_name: action-bot + author_email: action-bot@action-bot.com + new_branch: ${{ env.RC_BRANCH_NAME }} - # build_docker: - # name: Build Docker - # needs: update_compose_files - # uses: ./.github/workflows/build-docker.yaml - # with: - # build_type: development - # secrets: inherit + build_docker: + name: Build Docker + needs: update_compose_files + uses: ./.github/workflows/build-docker.yaml + with: + build_type: development + secrets: inherit os_image: name: OS image - # needs: update_compose_files + needs: update_compose_files runs-on: ubuntu-22.04 steps: - name: Create new branch @@ -77,17 +77,17 @@ jobs: new_branch_ref: ros2-devel access_token: ${{ secrets.GH_PAT}} - # - name: Build OS image - # uses: convictional/trigger-workflow-and-wait@v1.6.5 - # with: - # owner: husarion - # repo: husarion-ugv-rpi-os-img - # github_token: ${{ secrets.GH_PAT }} - # workflow_file_name: build_and_deploy_image.yaml - # ref: ${{ env.RC_BRANCH_NAME }} - # client_payload: | - # { - # "dev_image": "true", - # "husarion_ugv_version": "${{ env.RC_BRANCH_NAME }}", - # "image_tag": "${{ inputs.version }}" - # } + - name: Build OS image + uses: convictional/trigger-workflow-and-wait@v1.6.5 + with: + owner: husarion + repo: husarion-ugv-rpi-os-img + github_token: ${{ secrets.GH_PAT }} + workflow_file_name: build_and_deploy_image.yaml + ref: ${{ env.RC_BRANCH_NAME }} + client_payload: | + { + "dev_image": "true", + "husarion_ugv_version": "${{ env.RC_BRANCH_NAME }}", + "image_tag": "${{ inputs.version }}" + }