From c7f1e4c89a457d6d55454320d64d379f263d83bb Mon Sep 17 00:00:00 2001 From: marfanr Date: Tue, 27 Feb 2024 18:43:31 +0700 Subject: [PATCH 1/7] feat: add new workflows with ros2-ws-action --- .github/workflows/build-ros2-ws-action.yml | 58 ++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 .github/workflows/build-ros2-ws-action.yml diff --git a/.github/workflows/build-ros2-ws-action.yml b/.github/workflows/build-ros2-ws-action.yml new file mode 100644 index 0000000..4b26dc8 --- /dev/null +++ b/.github/workflows/build-ros2-ws-action.yml @@ -0,0 +1,58 @@ +name: ros2-ws-action +on: + workflow_dispatch: + pull_request: + push: + branches: [master, feature/fix-github-workflows] + workflow_run: + workflows: [Build and Test Nightly] + types: [requested, completed, in_progress] + branches: [feature/fix-github-workflows] +jobs: + build-and-test: + name: Build and Test + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2.3.4 + with: + path: suiryoku + + - name: Checkout Kansei + uses: actions/checkout@v2.3.4 + with: + repository: ichiro-its/kansei + path: kansei + + - name: Checkout Kansei Interfaces + uses: actions/checkout@v2.3.4 + with: + repository: ichiro-its/kansei_interfaces + path: kansei_interfaces + + - name: Checkout Keisan + uses: actions/checkout@v2.3.4 + with: + repository: ichiro-its/keisan + path: keisan + + - name: Checkout Aruku + uses: actions/checkout@v2.3.4 + with: + repository: ichiro-its/aruku + path: aruku + + - name: Checkout Aruku Interfaces + uses: actions/checkout@v2.3.4 + with: + repository: ichiro-its/aruku_interfaces + path: aruku_interfaces + + - name: Setup workspace + uses: ichiro-its/ros2-ws-action/setup@v1.0.1 + + - name: Build workspace + uses: ichiro-its/ros2-ws-action/build@v1.0.1 + + - name: Test workspace + uses: ichiro-its/ros2-ws-action/test@v1.0.1 From d65f722adeb5a8ce160fbe2cd78058b4b2ffd2a3 Mon Sep 17 00:00:00 2001 From: marfanr Date: Tue, 27 Feb 2024 18:50:55 +0700 Subject: [PATCH 2/7] feat: add missing dependency on worklows --- .github/workflows/build-ros2-ws-action.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.github/workflows/build-ros2-ws-action.yml b/.github/workflows/build-ros2-ws-action.yml index 4b26dc8..9b527b2 100644 --- a/.github/workflows/build-ros2-ws-action.yml +++ b/.github/workflows/build-ros2-ws-action.yml @@ -48,6 +48,24 @@ jobs: repository: ichiro-its/aruku_interfaces path: aruku_interfaces + - name: Checkout Tachimawari + uses: actions/checkout@v2.3.4 + with: + repository: ichiro-its/tachimawari + path: tachimawari + + - name: Checkout Tachimawari Interfaces + uses: actions/checkout@v2.3.4 + with: + repository: ichiro-its/tachimawari_interfaces + path: tachimawari_interfaces + + - name: Checkout Suiryoku Interfaces + uses: actions/checkout@v2.3.4 + with: + repository: ichiro-its/suiryoku_interfaces + path: suiryoku_interfaces + - name: Setup workspace uses: ichiro-its/ros2-ws-action/setup@v1.0.1 From 4063741c24cf34490db8ada02b48b7c716f63744 Mon Sep 17 00:00:00 2001 From: marfanr Date: Tue, 27 Feb 2024 18:52:47 +0700 Subject: [PATCH 3/7] feat: add missing dependency on worklows --- .github/workflows/build-ros2-ws-action.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/build-ros2-ws-action.yml b/.github/workflows/build-ros2-ws-action.yml index 9b527b2..f52a05d 100644 --- a/.github/workflows/build-ros2-ws-action.yml +++ b/.github/workflows/build-ros2-ws-action.yml @@ -66,6 +66,12 @@ jobs: repository: ichiro-its/suiryoku_interfaces path: suiryoku_interfaces + - name: Checkout Atama Interfaces + uses: actions/checkout@v2.3.4 + with: + repository: ichiro-its/atama_interfaces + path: atama_interfaces + - name: Setup workspace uses: ichiro-its/ros2-ws-action/setup@v1.0.1 From b15d4b0f9a5147da042fcbd605ac7295b059510c Mon Sep 17 00:00:00 2001 From: marfanr Date: Fri, 8 Mar 2024 17:44:19 +0700 Subject: [PATCH 4/7] feat: update checkout version, remove this branch from triggering workflows, and remove workflow run --- .github/workflows/build-ros2-ws-action.yml | 26 +++++++++------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build-ros2-ws-action.yml b/.github/workflows/build-ros2-ws-action.yml index f52a05d..2368178 100644 --- a/.github/workflows/build-ros2-ws-action.yml +++ b/.github/workflows/build-ros2-ws-action.yml @@ -3,71 +3,67 @@ on: workflow_dispatch: pull_request: push: - branches: [master, feature/fix-github-workflows] - workflow_run: - workflows: [Build and Test Nightly] - types: [requested, completed, in_progress] - branches: [feature/fix-github-workflows] + branches: [master] jobs: build-and-test: name: Build and Test runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v4.1.1 with: path: suiryoku - name: Checkout Kansei - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v4.1.1 with: repository: ichiro-its/kansei path: kansei - name: Checkout Kansei Interfaces - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v4.1.1 with: repository: ichiro-its/kansei_interfaces path: kansei_interfaces - name: Checkout Keisan - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v4.1.1 with: repository: ichiro-its/keisan path: keisan - name: Checkout Aruku - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v4.1.1 with: repository: ichiro-its/aruku path: aruku - name: Checkout Aruku Interfaces - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v4.1.1 with: repository: ichiro-its/aruku_interfaces path: aruku_interfaces - name: Checkout Tachimawari - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v4.1.1 with: repository: ichiro-its/tachimawari path: tachimawari - name: Checkout Tachimawari Interfaces - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v4.1.1 with: repository: ichiro-its/tachimawari_interfaces path: tachimawari_interfaces - name: Checkout Suiryoku Interfaces - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v4.1.1 with: repository: ichiro-its/suiryoku_interfaces path: suiryoku_interfaces - name: Checkout Atama Interfaces - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v4.1.1 with: repository: ichiro-its/atama_interfaces path: atama_interfaces From 6a92737b24bd4d29e63cb681f1b8afd777584cf6 Mon Sep 17 00:00:00 2001 From: marfanr Date: Mon, 11 Mar 2024 20:19:07 +0700 Subject: [PATCH 5/7] feat: simplify workflows steps and remove unused workflows --- .github/workflows/build-and-test-nightly.yml | 24 ------- .github/workflows/build-and-test-stable.yml | 22 ------ .github/workflows/build-debian-nightly.yml | 47 ------------- .github/workflows/build-debian-stable.yml | 44 ------------ .github/workflows/build-ros2-ws-action.yml | 70 ++++---------------- 5 files changed, 13 insertions(+), 194 deletions(-) delete mode 100644 .github/workflows/build-and-test-nightly.yml delete mode 100644 .github/workflows/build-and-test-stable.yml delete mode 100644 .github/workflows/build-debian-nightly.yml delete mode 100644 .github/workflows/build-debian-stable.yml diff --git a/.github/workflows/build-and-test-nightly.yml b/.github/workflows/build-and-test-nightly.yml deleted file mode 100644 index 22d8129..0000000 --- a/.github/workflows/build-and-test-nightly.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: Build and Test Nightly -on: - workflow_dispatch: - pull_request: - branches: [master] - push: - branches: [master] -jobs: - build-and-test-nightly: - runs-on: ubuntu-20.04 - steps: - - name: Checkout this repository - uses: actions/checkout@v2.3.4 - with: - path: suiryoku - - - name: Add nightly Debian repository and rosdep sources list - run: | - sudo apt update && sudo apt install curl - curl -s ${{ secrets.SERVER_BASE_URL }}/debian/setup-nightly.bash | bash -s - curl -s ${{ secrets.SERVER_BASE_URL }}/rosdep/setup.bash | bash -s - - - name: Build and test workspace - uses: ichiro-its/ros2-build-and-test-action@main diff --git a/.github/workflows/build-and-test-stable.yml b/.github/workflows/build-and-test-stable.yml deleted file mode 100644 index 5922a88..0000000 --- a/.github/workflows/build-and-test-stable.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: Build and Test Stable -on: - workflow_dispatch: - push: - branches: [master] -jobs: - build-and-test-stable: - runs-on: ubuntu-20.04 - steps: - - name: Checkout this repository - uses: actions/checkout@v2.3.4 - with: - path: suiryoku - - - name: Add stable Debian repository and rosdep sources list - run: | - sudo apt update && sudo apt install curl - curl -s ${{ secrets.SERVER_BASE_URL }}/debian/setup.bash | bash -s - curl -s ${{ secrets.SERVER_BASE_URL }}/rosdep/setup.bash | bash -s - - - name: Build and test workspace - uses: ichiro-its/ros2-build-and-test-action@main diff --git a/.github/workflows/build-debian-nightly.yml b/.github/workflows/build-debian-nightly.yml deleted file mode 100644 index e92531f..0000000 --- a/.github/workflows/build-debian-nightly.yml +++ /dev/null @@ -1,47 +0,0 @@ -name: Deploy Debian Nightly -on: - workflow_dispatch: - push: - branches: [master] -jobs: - deploy-debian-nightly: - runs-on: ubuntu-20.04 - steps: - - name: Checkout this repository - uses: actions/checkout@v2.3.4 - with: - path: suiryoku - - - name: Add nightly Debian repository and rosdep sources list - run: | - sudo apt update && sudo apt install curl - curl -s ${{ secrets.SERVER_BASE_URL }}/debian/setup-nightly.bash | bash -s - curl -s ${{ secrets.SERVER_BASE_URL }}/rosdep/setup.bash | bash -s - - - name: Build nightly Debian package - uses: ichiro-its/ros2-build-debian-action@main - with: - unique-version: true - - - name: Deploy nightly Debian package to server - uses: appleboy/scp-action@master - with: - host: ${{ secrets.SSH_HOST }} - port: ${{ secrets.SSH_PORT }} - username: ${{ secrets.SSH_USER }} - password: ${{ secrets.SSH_PASS }} - source: "package/*.deb" - target: "~/temp/nightly/suiryoku/" - rm: true - - - name: Prepare nightly Debian package in the server - uses: appleboy/ssh-action@master - with: - host: ${{ secrets.SSH_HOST }} - port: ${{ secrets.SSH_PORT }} - username: ${{ secrets.SSH_USER }} - password: ${{ secrets.SSH_PASS }} - script: | - cd ${{ secrets.SERVER_REPO_DIR }}/debian - reprepro includedeb nightly ~/temp/nightly/suiryoku/package/*.deb - rm -rf ~/temp/nightly/suiryoku/ diff --git a/.github/workflows/build-debian-stable.yml b/.github/workflows/build-debian-stable.yml deleted file mode 100644 index bc0da04..0000000 --- a/.github/workflows/build-debian-stable.yml +++ /dev/null @@ -1,44 +0,0 @@ -name: Deploy Debian Stable -on: - workflow_dispatch: - release: - types: [created] -jobs: - deploy-debian-stable: - runs-on: ubuntu-20.04 - steps: - - name: Checkout this repository - uses: actions/checkout@v2.3.4 - with: - path: suiryoku - - - name: Add stable Debian repository and rosdep sources list - run: | - sudo apt update && sudo apt install curl - curl -s ${{ secrets.SERVER_BASE_URL }}/debian/setup.bash | bash -s - curl -s ${{ secrets.SERVER_BASE_URL }}/rosdep/setup.bash | bash -s - - name: Build stable Debian package - uses: ichiro-its/ros2-build-debian-action@main - - - name: Deploy stable Debian package to server - uses: appleboy/scp-action@master - with: - host: ${{ secrets.SSH_HOST }} - port: ${{ secrets.SSH_PORT }} - username: ${{ secrets.SSH_USER }} - password: ${{ secrets.SSH_PASS }} - source: "package/*.deb" - target: "~/temp/stable/suiryoku/" - rm: true - - - name: Prepare stable Debian package in the server - uses: appleboy/ssh-action@master - with: - host: ${{ secrets.SSH_HOST }} - port: ${{ secrets.SSH_PORT }} - username: ${{ secrets.SSH_USER }} - password: ${{ secrets.SSH_PASS }} - script: | - cd ${{ secrets.SERVER_REPO_DIR }}/debian - reprepro includedeb stable ~/temp/stable/suiryoku/package/*.deb - rm -rf ~/temp/stable/suiryoku/ diff --git a/.github/workflows/build-ros2-ws-action.yml b/.github/workflows/build-ros2-ws-action.yml index 2368178..30423ad 100644 --- a/.github/workflows/build-ros2-ws-action.yml +++ b/.github/workflows/build-ros2-ws-action.yml @@ -10,63 +10,19 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4.1.1 - with: - path: suiryoku - - - name: Checkout Kansei - uses: actions/checkout@v4.1.1 - with: - repository: ichiro-its/kansei - path: kansei - - - name: Checkout Kansei Interfaces - uses: actions/checkout@v4.1.1 - with: - repository: ichiro-its/kansei_interfaces - path: kansei_interfaces - - - name: Checkout Keisan - uses: actions/checkout@v4.1.1 - with: - repository: ichiro-its/keisan - path: keisan - - - name: Checkout Aruku - uses: actions/checkout@v4.1.1 - with: - repository: ichiro-its/aruku - path: aruku - - - name: Checkout Aruku Interfaces - uses: actions/checkout@v4.1.1 - with: - repository: ichiro-its/aruku_interfaces - path: aruku_interfaces - - - name: Checkout Tachimawari - uses: actions/checkout@v4.1.1 - with: - repository: ichiro-its/tachimawari - path: tachimawari - - - name: Checkout Tachimawari Interfaces - uses: actions/checkout@v4.1.1 - with: - repository: ichiro-its/tachimawari_interfaces - path: tachimawari_interfaces - - - name: Checkout Suiryoku Interfaces - uses: actions/checkout@v4.1.1 - with: - repository: ichiro-its/suiryoku_interfaces - path: suiryoku_interfaces - - - name: Checkout Atama Interfaces - uses: actions/checkout@v4.1.1 - with: - repository: ichiro-its/atama_interfaces - path: atama_interfaces + uses: actions/checkout@v4.1.1 + + - name: Checkout Dependencies + run: | + git clone https://github.com/ichiro-its/kansei.git + git clone https://github.com/ichiro-its/kansei_interfaces.git + git clone https://github.com/ichiro-its/keisan.git + git clone https://github.com/ichiro-its/aruku.git + git clone https://github.com/ichiro-its/aruku_interfaces.git + git clone https://github.com/ichiro-its/tachimawari.git + git clone https://github.com/ichiro-its/tachimawari_interfaces.git + git clone https://github.com/ichiro-its/suiryoku_interfaces.git + git clone https://github.com/ichiro-its/atama_interfaces.git - name: Setup workspace uses: ichiro-its/ros2-ws-action/setup@v1.0.1 From 53676bddf98c48eb03afc3eb39ca245572c7e993 Mon Sep 17 00:00:00 2001 From: marfanr Date: Mon, 11 Mar 2024 20:40:22 +0700 Subject: [PATCH 6/7] feat: entering the workspace directory before checkout dependencies --- .github/workflows/build-ros2-ws-action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-ros2-ws-action.yml b/.github/workflows/build-ros2-ws-action.yml index 30423ad..604f8ee 100644 --- a/.github/workflows/build-ros2-ws-action.yml +++ b/.github/workflows/build-ros2-ws-action.yml @@ -14,6 +14,7 @@ jobs: - name: Checkout Dependencies run: | + cd $GITHUB_WORKSPACE git clone https://github.com/ichiro-its/kansei.git git clone https://github.com/ichiro-its/kansei_interfaces.git git clone https://github.com/ichiro-its/keisan.git From 45927000c02d36454b33e05a6d4d39c7f1a89159 Mon Sep 17 00:00:00 2001 From: marfanr Date: Mon, 11 Mar 2024 20:46:45 +0700 Subject: [PATCH 7/7] feat: fixing cannot locate dependency issues during colcon build --- .github/workflows/build-ros2-ws-action.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-ros2-ws-action.yml b/.github/workflows/build-ros2-ws-action.yml index 604f8ee..07c7ac4 100644 --- a/.github/workflows/build-ros2-ws-action.yml +++ b/.github/workflows/build-ros2-ws-action.yml @@ -10,7 +10,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4.1.1 + uses: actions/checkout@v4.1.1 + with: + path: suiryoku - name: Checkout Dependencies run: |