From 49fa7fcc447f8b259ab279b91085f432ae5a192c Mon Sep 17 00:00:00 2001 From: Kazuki Y <6259214+kazu0617@users.noreply.github.com> Date: Thu, 8 Dec 2022 02:07:19 +0900 Subject: [PATCH 01/15] upload contains "windows" in GH Actions --- .github/workflows/ccpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 47914a3f2..c6e30aaf3 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -128,7 +128,7 @@ jobs: shell: bash - uses: actions/upload-artifact@v3 - if: matrix.name == 'windows-msvc' + if: contains(matrix.name, 'windows') with: name: 'assimp-bins-${{ matrix.name }}-${{ github.sha }}' path: build/bin From e8393116d4f15af1f65f5ffa6b43cda21a88185f Mon Sep 17 00:00:00 2001 From: Kazuki Y <6259214+kazu0617@users.noreply.github.com> Date: Thu, 8 Dec 2022 02:09:09 +0900 Subject: [PATCH 02/15] Update ccpp.yml --- .github/workflows/ccpp.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index c6e30aaf3..aff93488b 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -2,9 +2,7 @@ name: C/C++ CI on: push: - branches: [ master ] pull_request: - branches: [ master ] permissions: contents: read # to fetch code (actions/checkout) From b0515a0dd06b9cd5d72762f66e00b558628f3a35 Mon Sep 17 00:00:00 2001 From: Kazuki Y <6259214+kazu0617@users.noreply.github.com> Date: Thu, 8 Dec 2022 20:50:48 +0900 Subject: [PATCH 03/15] Update ccpp.yml --- .github/workflows/ccpp.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index aff93488b..7653f6e17 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -130,3 +130,12 @@ jobs: with: name: 'assimp-bins-${{ matrix.name }}-${{ github.sha }}' path: build/bin + + - uses: marvinpinto/action-automatic-releases@latest + with: + repo_token: "${{ secrets.GITHUB_TOKEN }}" + automatic_release_tag: "latest" + prerelease: true + title: "AutoRelease" + files: | + build/bin/* From 8b73b8562844d51a7cfedb10bbb0ba18a42a6625 Mon Sep 17 00:00:00 2001 From: Kazuki Y <6259214+kazu0617@users.noreply.github.com> Date: Fri, 9 Dec 2022 01:34:19 +0900 Subject: [PATCH 04/15] Update ccpp.yml --- .github/workflows/ccpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 7653f6e17..a5f4fb6bd 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -134,7 +134,7 @@ jobs: - uses: marvinpinto/action-automatic-releases@latest with: repo_token: "${{ secrets.GITHUB_TOKEN }}" - automatic_release_tag: "latest" + automatic_release_tag: "master" prerelease: true title: "AutoRelease" files: | From a09a4d05187297e1782d3508adb1d3fa2d0d0322 Mon Sep 17 00:00:00 2001 From: Kazuki Y <6259214+kazu0617@users.noreply.github.com> Date: Fri, 9 Dec 2022 01:49:22 +0900 Subject: [PATCH 05/15] Update ccpp.yml --- .github/workflows/ccpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index a5f4fb6bd..d5a5c147a 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -5,7 +5,7 @@ on: pull_request: permissions: - contents: read # to fetch code (actions/checkout) + contents: write-all # to fetch code (actions/checkout),and release jobs: job: From 09375a386a2abfae4e990308daeadd6c0c0e48ba Mon Sep 17 00:00:00 2001 From: Kazuki Y <6259214+kazu0617@users.noreply.github.com> Date: Fri, 9 Dec 2022 10:28:32 +0900 Subject: [PATCH 06/15] Update ccpp.yml --- .github/workflows/ccpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index d5a5c147a..c4825d803 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -5,7 +5,7 @@ on: pull_request: permissions: - contents: write-all # to fetch code (actions/checkout),and release + contents: write # to fetch code (actions/checkout),and release jobs: job: From b9cf35ea3adff3bf55565ac07a006025b11a8da2 Mon Sep 17 00:00:00 2001 From: Kazuki Y <6259214+kazu0617@users.noreply.github.com> Date: Fri, 9 Dec 2022 16:20:49 +0900 Subject: [PATCH 07/15] Update ccpp.yml --- .github/workflows/ccpp.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index c4825d803..9c2146063 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -132,6 +132,7 @@ jobs: path: build/bin - uses: marvinpinto/action-automatic-releases@latest + if: contains(matrix.name, 'windows') with: repo_token: "${{ secrets.GITHUB_TOKEN }}" automatic_release_tag: "master" From cf3be00fd384ea9597e833ae7a49cf3d49dbdec3 Mon Sep 17 00:00:00 2001 From: Kazuki Y <6259214+kazu0617@users.noreply.github.com> Date: Fri, 9 Dec 2022 17:42:45 +0900 Subject: [PATCH 08/15] Update ccpp.yml --- .github/workflows/ccpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 9c2146063..8f2ba442d 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -132,7 +132,7 @@ jobs: path: build/bin - uses: marvinpinto/action-automatic-releases@latest - if: contains(matrix.name, 'windows') + if: contains(matrix.name, 'windows-latest-cl') with: repo_token: "${{ secrets.GITHUB_TOKEN }}" automatic_release_tag: "master" From fde8bf1071ff0cb81c2aec23403dba9746b05046 Mon Sep 17 00:00:00 2001 From: Kazuki Y <6259214+kazu0617@users.noreply.github.com> Date: Sat, 10 Dec 2022 17:37:49 +0900 Subject: [PATCH 09/15] =?UTF-8?q?build=E3=81=99=E3=82=8B=E6=96=B9=E3=81=AB?= =?UTF-8?q?=E3=81=A4=E3=81=84=E3=81=A6windows-msvc=E3=81=AE=E3=81=A4?= =?UTF-8?q?=E3=81=84=E3=81=A6=E3=81=84=E3=82=8B=E6=96=B9=E3=81=AB=E3=81=97?= =?UTF-8?q?=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit この二つ、何の違いがあるかいまいち理解してない… clでビルドするかhunterでビルドするかの違い? --- .github/workflows/ccpp.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 8f2ba442d..79b52b544 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -2,7 +2,9 @@ name: C/C++ CI on: push: + branches: [master] pull_request: + branches: [master] permissions: contents: write # to fetch code (actions/checkout),and release @@ -97,12 +99,12 @@ jobs: - name: Set Windows specific CMake arguments if: contains(matrix.name, 'windows') id: windows_extra_cmake_args - run: echo "::set-output name=args::-DASSIMP_BUILD_ASSIMP_TOOLS=1 -DASSIMP_BUILD_ASSIMP_VIEW=1" + run: echo "args=-DASSIMP_BUILD_ASSIMP_TOOLS=1 -DASSIMP_BUILD_ASSIMP_VIEW=1" >> $GITHUB_OUTPUT - name: Set Hunter specific CMake arguments if: contains(matrix.name, 'hunter') id: hunter_extra_cmake_args - run: echo "::set-output name=args::-DBUILD_SHARED_LIBS=OFF -DASSIMP_HUNTER_ENABLED=ON -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/cmake/polly/${{ matrix.toolchain }}.cmake" + run: echo "args=-DBUILD_SHARED_LIBS=OFF -DASSIMP_HUNTER_ENABLED=ON -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/cmake/polly/${{ matrix.toolchain }}.cmake" >> $GITHUB_OUTPUT - name: configure and build uses: lukka/run-cmake@v3 @@ -119,20 +121,20 @@ jobs: - name: Exclude certain tests in Hunter specific builds if: contains(matrix.name, 'hunter') id: hunter_extra_test_args - run: echo "::set-output name=args::--gtest_filter=-utOpenGEXImportExport.Importissue1340_EmptyCameraObject:utColladaZaeImportExport.importBlenFromFileTest" + run: echo "args=--gtest_filter=-utOpenGEXImportExport.Importissue1340_EmptyCameraObject:utColladaZaeImportExport.importBlenFromFileTest" >> $GITHUB_OUTPUT - name: test run: cd build/bin && ./unit ${{ steps.hunter_extra_test_args.outputs.args }} shell: bash - uses: actions/upload-artifact@v3 - if: contains(matrix.name, 'windows') + if: contains(matrix.name, 'windows-msvc') with: name: 'assimp-bins-${{ matrix.name }}-${{ github.sha }}' path: build/bin - uses: marvinpinto/action-automatic-releases@latest - if: contains(matrix.name, 'windows-latest-cl') + if: contains(matrix.name, 'windows-msvc') with: repo_token: "${{ secrets.GITHUB_TOKEN }}" automatic_release_tag: "master" From bbfc9f4658f3703783d398bc3325502f7e97532b Mon Sep 17 00:00:00 2001 From: Kazuki Y <6259214+kazu0617@users.noreply.github.com> Date: Mon, 12 Dec 2022 10:34:45 +0900 Subject: [PATCH 10/15] =?UTF-8?q?upload/release=E5=AF=BE=E8=B1=A1=E3=81=AE?= =?UTF-8?q?artifact=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 追加当時のIssueを参考に修正(当時はHunterなかったっぽい) https://github.com/assimp/assimp/commit/a9a0c3093226a23eb7558539bc6ebe5bcb98442b --- .github/workflows/ccpp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 79b52b544..a9e569b46 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -128,13 +128,13 @@ jobs: shell: bash - uses: actions/upload-artifact@v3 - if: contains(matrix.name, 'windows-msvc') + if: contains(matrix.name, 'latest') with: name: 'assimp-bins-${{ matrix.name }}-${{ github.sha }}' path: build/bin - uses: marvinpinto/action-automatic-releases@latest - if: contains(matrix.name, 'windows-msvc') + if: contains(matrix.name, 'windows-latest') with: repo_token: "${{ secrets.GITHUB_TOKEN }}" automatic_release_tag: "master" From f77db867b568ef64c12791eb01fe1ce5b16c5f5c Mon Sep 17 00:00:00 2001 From: Kazuki Y <6259214+kazu0617@users.noreply.github.com> Date: Mon, 12 Dec 2022 12:43:34 +0900 Subject: [PATCH 11/15] Update ccpp.yml --- .github/workflows/ccpp.yml | 88 ++++++++++++++++++++++++++++++++------ 1 file changed, 76 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index a9e569b46..13725e1ef 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -2,15 +2,15 @@ name: C/C++ CI on: push: - branches: [master] + branches: [ master ] pull_request: - branches: [master] + branches: [ master ] permissions: contents: write # to fetch code (actions/checkout),and release jobs: - job: + build: name: ${{ matrix.name }}-build-and-test runs-on: ${{ matrix.os }} strategy: @@ -133,12 +133,76 @@ jobs: name: 'assimp-bins-${{ matrix.name }}-${{ github.sha }}' path: build/bin - - uses: marvinpinto/action-automatic-releases@latest - if: contains(matrix.name, 'windows-latest') - with: - repo_token: "${{ secrets.GITHUB_TOKEN }}" - automatic_release_tag: "master" - prerelease: true - title: "AutoRelease" - files: | - build/bin/* + create-release: + needs: [build] + runs-on: ubuntu-latest + if: startsWith(github.ref, 'refs/tags/') + steps: + - id: create-release + uses: actions/create-release@v1 + env: + GITHUB_TOKEN: '${{secrets.GITHUB_TOKEN}}' + with: + tag_name: '${{github.ref}}' + release_name: 'Release ${{github.ref}}' + draft: false + prerelease: true + - run: | + echo '${{steps.create-release.outputs.upload_url}}' > release_upload_url.txt + - uses: actions/upload-artifact@v1 + with: + name: create-release + path: release_upload_url.txt + + upload-release: + strategy: + matrix: + name: [ubuntu-latest-g++, macos-latest-clang++, windows-latest-cl.exe, ubuntu-latest-clang++, ubuntu-gcc-hunter, macos-clang-hunter, windows-msvc-hunter] + # For Windows msvc, for Linux and macOS let's use the clang compiler, use gcc for Linux. + include: + - name: windows-latest-cl.exe + os: windows-latest + cxx: cl.exe + cc: cl.exe + - name: ubuntu-latest-clang++ + os: ubuntu-latest + cxx: clang++ + cc: clang + - name: macos-latest-clang++ + os: macos-latest + cxx: clang++ + cc: clang + - name: ubuntu-latest-g++ + os: ubuntu-latest + cxx: g++ + cc: gcc + - name: ubuntu-gcc-hunter + os: ubuntu-latest + toolchain: ninja-gcc-cxx17-fpic + - name: macos-clang-hunter + os: macos-latest + toolchain: ninja-clang-cxx17-fpic + - name: windows-msvc-hunter + os: windows-latest + toolchain: ninja-vs-win64-cxx17 + + needs: [create-release] + runs-on: ubuntu-latest + if: startsWith(github.ref, 'refs/tags/') + steps: + - uses: softprops/action-gh-release@v1 + with: + name: create-release + - id: upload-url + run: | + echo "url=$(cat create-release/release_upload_url.txt)" >> $GITHUB_OUTPUT + - uses: actions/download-artifact@v1 + with: + name: 'assimp-bins-${{ matrix.name }}-${{ github.sha }}' + - uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: '${{secrets.GITHUB_TOKEN}}' + with: + files: | + *.zip + From 5925dcd0e251d08cc4ce3f195b06241e55268ef3 Mon Sep 17 00:00:00 2001 From: Kazuki Y <6259214+kazu0617@users.noreply.github.com> Date: Sat, 17 Dec 2022 15:08:25 +0900 Subject: [PATCH 12/15] Update ccpp.yml --- .github/workflows/ccpp.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 13725e1ef..6b7e57c54 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -133,6 +133,16 @@ jobs: name: 'assimp-bins-${{ matrix.name }}-${{ github.sha }}' path: build/bin + - uses: marvinpinto/action-automatic-releases@latest + if: contains(matrix.name, 'windows-latest') + with: + repo_token: "${{ secrets.GITHUB_TOKEN }}" + automatic_release_tag: "master" + prerelease: true + title: "AutoRelease" + files: | + build/bin/* + create-release: needs: [build] runs-on: ubuntu-latest From dd313da24f49d371f4b3a275839c423a3055e380 Mon Sep 17 00:00:00 2001 From: Kazuki Y <6259214+kazu0617@users.noreply.github.com> Date: Sat, 17 Dec 2022 21:04:11 +0900 Subject: [PATCH 13/15] Update ccpp.yml --- .github/workflows/ccpp.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 6b7e57c54..72f010c96 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -41,9 +41,9 @@ jobs: - name: macos-clang-hunter os: macos-latest toolchain: ninja-clang-cxx17-fpic - - name: windows-msvc-hunter - os: windows-latest - toolchain: ninja-vs-win64-cxx17 + #- name: windows-msvc-hunter + # os: windows-latest + # toolchain: ninja-vs-win64-cxx17 steps: - uses: actions/checkout@v3 @@ -134,7 +134,7 @@ jobs: path: build/bin - uses: marvinpinto/action-automatic-releases@latest - if: contains(matrix.name, 'windows-latest') + if: contains(matrix.name, 'windows-latest-cl.exe') with: repo_token: "${{ secrets.GITHUB_TOKEN }}" automatic_release_tag: "master" From 2ec097b862012fcb80097544fc6f8fd7a4c9f155 Mon Sep 17 00:00:00 2001 From: Kazuki Y <6259214+kazu0617@users.noreply.github.com> Date: Sat, 17 Dec 2022 21:06:36 +0900 Subject: [PATCH 14/15] Update ccpp.yml --- .github/workflows/ccpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 72f010c96..ea7f05d9f 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -16,7 +16,7 @@ jobs: strategy: fail-fast: false matrix: - name: [ubuntu-latest-g++, macos-latest-clang++, windows-latest-cl.exe, ubuntu-latest-clang++, ubuntu-gcc-hunter, macos-clang-hunter, windows-msvc-hunter] + name: [ubuntu-latest-g++, macos-latest-clang++, windows-latest-cl.exe, ubuntu-latest-clang++, ubuntu-gcc-hunter, macos-clang-hunter] # For Windows msvc, for Linux and macOS let's use the clang compiler, use gcc for Linux. include: - name: windows-latest-cl.exe From 2c87088079c3d7ad50eef8c8d03f0d7fc662c744 Mon Sep 17 00:00:00 2001 From: Kazuki Y <6259214+kazu0617@users.noreply.github.com> Date: Sat, 17 Dec 2022 21:49:28 +0900 Subject: [PATCH 15/15] Update ccpp.yml --- .github/workflows/ccpp.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index ea7f05d9f..2fb20def4 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -16,7 +16,7 @@ jobs: strategy: fail-fast: false matrix: - name: [ubuntu-latest-g++, macos-latest-clang++, windows-latest-cl.exe, ubuntu-latest-clang++, ubuntu-gcc-hunter, macos-clang-hunter] + name: [ubuntu-latest-g++, macos-latest-clang++, windows-latest-cl.exe, ubuntu-latest-clang++, ubuntu-gcc-hunter, macos-clang-hunter, windows-msvc-hunter] # For Windows msvc, for Linux and macOS let's use the clang compiler, use gcc for Linux. include: - name: windows-latest-cl.exe @@ -41,9 +41,9 @@ jobs: - name: macos-clang-hunter os: macos-latest toolchain: ninja-clang-cxx17-fpic - #- name: windows-msvc-hunter - # os: windows-latest - # toolchain: ninja-vs-win64-cxx17 + - name: windows-msvc-hunter + os: windows-latest + toolchain: ninja-vs-win64-cxx17 steps: - uses: actions/checkout@v3 @@ -130,11 +130,11 @@ jobs: - uses: actions/upload-artifact@v3 if: contains(matrix.name, 'latest') with: - name: 'assimp-bins-${{ matrix.name }}-${{ github.sha }}' + name: 'assimp-bins-${{ matrix.name }}' path: build/bin - uses: marvinpinto/action-automatic-releases@latest - if: contains(matrix.name, 'windows-latest-cl.exe') + if: contains(matrix.name, 'windows-msvc-hunter') with: repo_token: "${{ secrets.GITHUB_TOKEN }}" automatic_release_tag: "master"