Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Kimkulling/fix string and refactor issue 5262 #5267

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
49fa7fc
upload contains "windows" in GH Actions
kazu0617 Dec 7, 2022
e839311
Update ccpp.yml
kazu0617 Dec 7, 2022
05b9940
Merge branch 'assimp:master' into master
kazu0617 Dec 8, 2022
b0515a0
Update ccpp.yml
kazu0617 Dec 8, 2022
8b73b85
Update ccpp.yml
kazu0617 Dec 8, 2022
a09a4d0
Update ccpp.yml
kazu0617 Dec 8, 2022
09375a3
Update ccpp.yml
kazu0617 Dec 9, 2022
b9cf35e
Update ccpp.yml
kazu0617 Dec 9, 2022
1f8f4da
Merge branch 'assimp:master' into master
kazu0617 Dec 9, 2022
cf3be00
Update ccpp.yml
kazu0617 Dec 9, 2022
fde8bf1
buildする方についてwindows-msvcのついている方にした
kazu0617 Dec 10, 2022
bbfc9f4
upload/release対象のartifactを修正
kazu0617 Dec 12, 2022
53f0d5d
fix ccpp.yml -- fix matrix.name check for artifact
kazu0617 Dec 12, 2022
4b523e9
fix ccpp.yml - build both hunter or not
kazu0617 Dec 12, 2022
f77db86
Update ccpp.yml
kazu0617 Dec 12, 2022
b1a700d
Merge pull request #1 from NeosSharedProject/TestPatch
kazu0617 Dec 12, 2022
9b64449
Merge branch 'assimp:master' into master
kazu0617 Dec 17, 2022
5925dcd
Update ccpp.yml
kazu0617 Dec 17, 2022
dd313da
Update ccpp.yml
kazu0617 Dec 17, 2022
2ec097b
Update ccpp.yml
kazu0617 Dec 17, 2022
2c87088
Update ccpp.yml
kazu0617 Dec 17, 2022
b406ce6
Merge branch 'assimp:master' into master
kazu0617 Dec 20, 2022
d04dd1a
Merge branch 'master' into fix-artifact
kazu0617 Dec 21, 2022
cd0bbe1
Merge branch 'master' into fix-artifact
kazu0617 Dec 28, 2022
a84bf34
Update ccpp.yml
kazu0617 Dec 29, 2022
26e4ab2
Merge branch 'assimp:master' into master
kazu0617 Dec 29, 2022
6c95fe1
Merge branch 'master' into fix-artifact
kazu0617 Dec 29, 2022
ce7b2e5
Merge branch 'fix-artifact' of https://github.com/NeosSharedProject/a…
kimkulling Feb 5, 2023
b58bec3
Merge branch 'NeosSharedProject-fix-artifact'
kimkulling Feb 5, 2023
6332f8a
Merge branch 'master' of https://github.com/assimp/assimp
kimkulling Feb 8, 2023
e2fa181
Merge branch 'master' of https://github.com/assimp/assimp
kimkulling Feb 14, 2023
d65049a
Merge branch 'master' of https://github.com/assimp/assimp
kimkulling Sep 9, 2023
3dd8327
Merge branch 'master' of https://github.com/assimp/assimp
kimkulling Oct 7, 2023
824db16
Fix verbose string + refactorings
kimkulling Oct 7, 2023
3ce8af1
Revert "Fix verbose string + refactorings"
kimkulling Oct 7, 2023
2998ad8
Fix verbose string + refactorings
kimkulling Oct 7, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
100 changes: 92 additions & 8 deletions .github/workflows/ccpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ on:
branches: [ master ]

permissions:
contents: read # to fetch code (actions/checkout)
contents: write # to fetch code (actions/checkout),and release

jobs:
job:
build:
name: ${{ matrix.name }}-build-and-test
runs-on: ${{ matrix.os }}
strategy:
Expand Down Expand Up @@ -93,12 +93,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 -DASSIMP_BUILD_ZLIB=1"
run: echo ":set-output name=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
Expand All @@ -115,14 +115,98 @@ 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: matrix.name == 'windows-msvc'
if: contains(matrix.name,'windows')
with:
name: 'assimp-bins-${{ matrix.name }}-${{ github.sha }}'
path: build/bin
name: 'assimp-bins-${{ matrix.name }}'
path: build/bin/assimp*.exe

- uses: marvinpinto/action-automatic-releases@latest
if: contains(matrix.name, 'windows-msvc-hunter')
with:
repo_token: "${{ secrets.GITHUB_TOKEN }}"
automatic_release_tag: "master"
prerelease: true
title: "AutoRelease"
files: |
build/bin/assimp*.exe

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