From fdbbd3430bb3e0a294aa92ea39a776695f26012b Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Sun, 7 Nov 2021 19:30:26 +0100 Subject: [PATCH 1/9] Add assimp --- .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 0c387ce..189bef0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -117,7 +117,7 @@ jobs: - name: Install vcpkg ports shell: bash run: | - C:/robotology/vcpkg/vcpkg.exe --overlay-ports=C:/robotology/robotology-vcpkg-ports --overlay-ports=${GITHUB_WORKSPACE}/custom-ports install --triplet x64-windows asio boost-circular-buffer boost-asio boost-bind boost-process boost-dll boost-filesystem boost-system freeglut esdcan-binary glew glfw3 nlohmann-json ode openssl libxml2 matio ipopt-binary cppad irrlicht spdlog + C:/robotology/vcpkg/vcpkg.exe --overlay-ports=C:/robotology/robotology-vcpkg-ports --overlay-ports=${GITHUB_WORKSPACE}/custom-ports install --triplet x64-windows asio assimp boost-circular-buffer boost-asio boost-bind boost-process boost-dll boost-filesystem boost-system freeglut esdcan-binary glew glfw3 nlohmann-json ode openssl libxml2 matio ipopt-binary cppad irrlicht spdlog C:/robotology/vcpkg/vcpkg.exe list # Remove temporary files https://github.com/Microsoft/vcpkg/blob/master/docs/about/faq.md#how-can-i-remove-temporary-files From 180939063f96c4481c523783f3dd6300b1dfbfeb Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 7 Jan 2022 11:44:16 +0100 Subject: [PATCH 2/9] Update ci.yml --- .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 189bef0..9ede57e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,7 @@ jobs: cd C:/robotology git clone https://github.com/Microsoft/vcpkg cd vcpkg - git checkout cdd51899f6ae3736bfbe936f9e387f86d4a63a58 + git checkout 2021.12.01 C:/robotology/vcpkg/bootstrap-vcpkg.sh git clone https://github.com/robotology/robotology-vcpkg-ports C:/robotology/robotology-vcpkg-ports cd C:/robotology/robotology-vcpkg-ports @@ -41,7 +41,7 @@ jobs: - name: Install vcpkg ports shell: bash run: | - C:/robotology/vcpkg/vcpkg.exe --overlay-ports=C:/robotology/robotology-vcpkg-ports --overlay-ports=${GITHUB_WORKSPACE}/custom-ports install --triplet x64-windows ace eigen3 gsl libjpeg-turbo opencv portaudio sdl1 sdl2 qt5-base[latest] qt5-declarative qt5-multimedia qt5-quickcontrols qt5-quickcontrols2 sqlite3[core,tool] tinyxml + C:/robotology/vcpkg/vcpkg.exe --overlay-ports=C:/robotology/robotology-vcpkg-ports --overlay-ports=${GITHUB_WORKSPACE}/custom-ports install --triplet x64-windows ace eigen3 graphviz gsl libjpeg-turbo opencv portaudio sdl1 sdl2 qt5-base[latest] qt5-declarative qt5-multimedia qt5-quickcontrols qt5-quickcontrols2 sqlite3[core,tool] tinyxml C:/robotology/vcpkg/vcpkg.exe list # Remove temporary files https://github.com/Microsoft/vcpkg/blob/master/docs/about/faq.md#how-can-i-remove-temporary-files From 8cf361dadc371a8181f27c1c00caf0954e6a2458 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 30 Mar 2022 15:16:25 +0200 Subject: [PATCH 3/9] Update vcpkg to 2022.03.10 --- .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 9ede57e..baf07ff 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,7 @@ jobs: cd C:/robotology git clone https://github.com/Microsoft/vcpkg cd vcpkg - git checkout 2021.12.01 + git checkout 2022.03.10 C:/robotology/vcpkg/bootstrap-vcpkg.sh git clone https://github.com/robotology/robotology-vcpkg-ports C:/robotology/robotology-vcpkg-ports cd C:/robotology/robotology-vcpkg-ports From d09ed2504902128719530bf624b79971309a99e2 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 30 Mar 2022 19:27:38 +0200 Subject: [PATCH 4/9] Switch upload and download artifacts to v3 --- .github/workflows/ci.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index baf07ff..a2ff0b1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -74,7 +74,7 @@ jobs: cp scripts/removePathsFromUserEnvVariables-vcpkg.ps1 /c/robotology/scripts cp scripts/removePathsFromUserEnvVariables-deps.ps1 /c/robotology/scripts - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v3 with: name: vcpkg-robotology-yarp-deps-only path: C:/robotology @@ -104,7 +104,7 @@ jobs: steps: - uses: actions/checkout@v1 - - uses: actions/download-artifact@v1 + - uses: actions/download-artifact@v3 with: name: vcpkg-robotology-yarp-deps-only path: C:/robotology @@ -137,7 +137,7 @@ jobs: rm -rf /c/robotology/vcpkg/installed/x64-windows/bin/*.pdb rm -rf /c/robotology/vcpkg/installed/x64-windows/debug/bin/*.pdb - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v3 with: name: vcpkg-robotology path: C:/robotology @@ -166,7 +166,7 @@ jobs: steps: - uses: actions/checkout@v1 - - uses: actions/download-artifact@v1 + - uses: actions/download-artifact@v3 with: name: vcpkg-robotology path: C:/robotology @@ -200,7 +200,7 @@ jobs: rm -rf /c/robotology/vcpkg/installed/x64-windows/bin/*.pdb rm -rf /c/robotology/vcpkg/installed/x64-windows/debug/bin/*.pdb - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v3 with: name: vcpkg-robotology-with-gazebo-deps path: C:/robotology @@ -212,7 +212,7 @@ jobs: steps: - uses: actions/checkout@v1 - - uses: actions/download-artifact@v1 + - uses: actions/download-artifact@v3 with: name: vcpkg-robotology-with-gazebo-deps path: C:/robotology @@ -244,7 +244,7 @@ jobs: - name: Upload logs on failures if: ${{ failure() }} - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v3 with: name: gazebo-colcon-logs path: C:/robotology/gazebo/log From a80307e95b691186fee20dd1ecdb1f00cd4a20df Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 30 Mar 2022 19:29:33 +0200 Subject: [PATCH 5/9] Only run CI on master's commit --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a2ff0b1..7bd1864 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,6 +2,8 @@ name: CI on: push: + branches: + - master pull_request: release: types: [published] From 6d749fff65378fdc7572a352d500733d200a2d22 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 1 Apr 2022 11:32:16 +0200 Subject: [PATCH 6/9] Bump vcpkg to 27fd32e91c172e8b8a2ee338efc088a0c0103348 --- .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 7bd1864..ea313ae 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,7 +34,7 @@ jobs: cd C:/robotology git clone https://github.com/Microsoft/vcpkg cd vcpkg - git checkout 2022.03.10 + git checkout 27fd32e91c172e8b8a2ee338efc088a0c0103348 C:/robotology/vcpkg/bootstrap-vcpkg.sh git clone https://github.com/robotology/robotology-vcpkg-ports C:/robotology/robotology-vcpkg-ports cd C:/robotology/robotology-vcpkg-ports From 87b9f0c785a4b142a128b4c94edab54b31d35d90 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Mon, 11 Apr 2022 15:27:21 +0200 Subject: [PATCH 7/9] Update gazebo-repos.yaml --- gazebo-repos.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gazebo-repos.yaml b/gazebo-repos.yaml index ab9141c..bc23d89 100644 --- a/gazebo-repos.yaml +++ b/gazebo-repos.yaml @@ -2,4 +2,4 @@ repositories: gazebo: type: git url: https://github.com/osrf/gazebo - version: 0d1642979382d95ae5a120fdccaeb7ad4c51cf36 + version: gazebo11_11.10.2 From a29dc10eb2f24789744789eb74de0f824a1721aa Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Tue, 12 Apr 2022 09:45:08 +0200 Subject: [PATCH 8/9] Update README.md --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 49e9b51..11fd64f 100644 --- a/README.md +++ b/README.md @@ -82,5 +82,3 @@ To use the script in a GitHub Action script, you can use the following snippet: You can then specify the `CMAKE_TOOLCHAIN_FILE` for the CMake projects that you want that use the installed dependencies, or execute the enviroment variables setup scripts. - - From d57f3c50048ef07c9efcffd4154e79de6377aee2 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Tue, 12 Apr 2022 13:47:28 +0200 Subject: [PATCH 9/9] Compress artifacts (#52) --- .github/workflows/ci.yml | 51 ++++++++++++++++++++++++++-------------- 1 file changed, 33 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ea313ae..e4227f0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -76,17 +76,16 @@ jobs: cp scripts/removePathsFromUserEnvVariables-vcpkg.ps1 /c/robotology/scripts cp scripts/removePathsFromUserEnvVariables-deps.ps1 /c/robotology/scripts - - uses: actions/upload-artifact@v3 - with: - name: vcpkg-robotology-yarp-deps-only - path: C:/robotology - - - name: Prepare release file - if: github.event_name == 'release' + - name: Prepare artifacts and release file shell: cmd run: | 7z a vcpkg-robotology-yarp-only.zip C:\robotology + - uses: actions/upload-artifact@v3 + with: + name: vcpkg-robotology-yarp-deps-only + path: vcpkg-robotology-yarp-only.zip + - name: Upload Release Asset if: github.event_name == 'release' uses: actions/upload-release-asset@v1.0.1 @@ -109,7 +108,11 @@ jobs: - uses: actions/download-artifact@v3 with: name: vcpkg-robotology-yarp-deps-only - path: C:/robotology + + - name: Extract artifact + shell: bash + run: | + 7z x -y -oC:/ vcpkg-robotology-yarp-only.zip - name: Check free space shell: bash @@ -139,17 +142,16 @@ jobs: rm -rf /c/robotology/vcpkg/installed/x64-windows/bin/*.pdb rm -rf /c/robotology/vcpkg/installed/x64-windows/debug/bin/*.pdb - - uses: actions/upload-artifact@v3 - with: - name: vcpkg-robotology - path: C:/robotology - - - name: Prepare release file - if: github.event_name == 'release' + - name: Prepare artifact and release file shell: cmd run: | 7z a vcpkg-robotology.zip C:\robotology + - uses: actions/upload-artifact@v3 + with: + name: vcpkg-robotology + path: vcpkg-robotology.zip + - name: Upload Release Asset if: github.event_name == 'release' uses: actions/upload-release-asset@v1.0.1 @@ -171,7 +173,11 @@ jobs: - uses: actions/download-artifact@v3 with: name: vcpkg-robotology - path: C:/robotology + + - name: Extract artifact + shell: bash + run: | + 7z x -y -oC: vcpkg-robotology.zip - name: Check free space shell: bash @@ -202,10 +208,15 @@ jobs: rm -rf /c/robotology/vcpkg/installed/x64-windows/bin/*.pdb rm -rf /c/robotology/vcpkg/installed/x64-windows/debug/bin/*.pdb + - name: Prepare artifacts file + shell: cmd + run: | + 7z a vcpkg-robotology-with-gazebo-deps.zip C:\robotology + - uses: actions/upload-artifact@v3 with: name: vcpkg-robotology-with-gazebo-deps - path: C:/robotology + path: vcpkg-robotology-with-gazebo-deps.zip build-with-gazebo: runs-on: windows-2019 @@ -217,7 +228,11 @@ jobs: - uses: actions/download-artifact@v3 with: name: vcpkg-robotology-with-gazebo-deps - path: C:/robotology + + - name: Extract artifact + shell: bash + run: | + 7z x -y -oC: vcpkg-robotology-with-gazebo-deps.zip - name: Check free space shell: bash