diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml deleted file mode 100644 index 83237ba..0000000 --- a/.github/workflows/build-test.yml +++ /dev/null @@ -1,279 +0,0 @@ -name: "Build FBX2GLTF" -on: - push: - branches: - - master - -concurrency: - group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-build - cancel-in-progress: true - -jobs: - build-win-10: - runs-on: windows-2019 - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Install conan - run: | - pip install --upgrade conan - shell: bash - - - name: Setup conan profile - run: | - conan profile new default --detect - conan profile show default - shell: bash - - - name: Setup filter.lfs.required - run: | - git config --global filter.lfs.required false - shell: bash - - - name: Setup filter.lfs.smudge - run: | - git config --global filter.lfs.smudge "git-lfs smudge --skip %f" - shell: bash - - - name: Setup filter.lfs.process - run: | - git config --global filter.lfs.process "git-lfs filter-process --skip" - shell: bash - - - name: Fetch sdk - run: | - curl -O -L "https://github.com/V-Sekai/FBXSDK-Windows/archive/refs/tags/2020.2.zip" - shell: cmd - - - name: install 7z extract - run: | - 7z x 2020.2.zip - shell: cmd - - - name: move - run: | - mkdir -p sdk - mv ./FBXSDK-Windows-2020.2/sdk . - shell: bash - - - name: Decompress sdk - run: | - zstd -d -r --rm ./sdk || true - shell: bash - - - name: Conan install - run: | - conan install . --build=missing -i build -s build_type=Release -s compiler="Visual Studio" - shell: cmd - - - name: Conan build - run: | - conan build -bf build . - shell: cmd - - - name: Run FBX2glTF help - run: | - ./build/Release/FBX2glTF.exe --help - shell: bash - - - uses: actions/upload-artifact@v2 - with: - name: FBX2glTF-windows.exe - path: build/Release/FBX2glTF.exe - - - name: Copy licenses - run: | - mkdir -p result - cp sdk/Windows/2020.2/License.rtf result/thirdparty-license.rtf - cp LICENSE result/LICENSE - cp build/Release/FBX2glTF.exe result/FBX2glTF.exe - shell: bash - - - name: Archive code coverage results - uses: actions/upload-artifact@v3 - with: - name: windows-packages - path: result - - build-ubuntu: - runs-on: ubuntu-20.04 - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Install conan - run: | - pip install --upgrade conan - shell: bash - - - name: Setup conan profile - run: | - conan profile new default --detect - conan profile show default - shell: bash - - - name: Setup filter.lfs.required - run: | - git config --global filter.lfs.required false - shell: bash - - - name: Setup filter.lfs.smudge - run: | - git config --global filter.lfs.smudge "git-lfs smudge --skip %f" - shell: bash - - - name: Setup filter.lfs.process - run: | - git config --global filter.lfs.process "git-lfs filter-process --skip" - shell: bash - - - name: Fetch sdk - run: | - curl -O -L "https://github.com/V-Sekai/FBXSDK-Linux/archive/refs/tags/2020.2.zip" - shell: bash - - - name: install 7z extract - run: | - 7z x 2020.2.zip - shell: bash - - - name: move - run: | - mkdir -p sdk - mv ./FBXSDK-Linux-2020.2/sdk . - shell: bash - - - name: Decompress sdk - run: | - zstd -d -r --rm ./sdk || true - shell: bash - - - name: Conan install - run: | - conan install . -i build -s build_type=Release --build fmt -s compiler.libcxx=libstdc++11 - shell: bash - - - name: Conan build - run: | - conan build -bf build . - shell: bash - - - name: Run FBX2glTF help - run: | - ./build/FBX2glTF --help - shell: bash - - - uses: actions/upload-artifact@v2 - with: - name: FBX2glTF-linux - path: build/FBX2glTF - - - name: Copy licenses - run: | - mkdir -p result - cp sdk/Linux/2020.2/License.txt result/thirdparty-license.txt - cp LICENSE result/LICENSE - cp build/FBX2glTF result/FBX2glTF - shell: bash - - - name: Archive code coverage results - uses: actions/upload-artifact@v3 - with: - name: linux-packages - path: result - - build-macos-x86_64: - runs-on: macos-11 - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Update python - uses: actions/setup-python@v1 - - - name: Install conan - run: | - pip install --upgrade conan - shell: bash - - - name: Setup conan profile - run: | - conan profile new default --detect - conan profile show default - shell: bash - - - name: Setup filter.lfs.required - run: | - git config --global filter.lfs.required false - shell: bash - - - name: Setup filter.lfs.smudge - run: | - git config --global filter.lfs.smudge "git-lfs smudge --skip %f" - shell: bash - - - name: Setup filter.lfs.process - run: | - git config --global filter.lfs.process "git-lfs filter-process --skip" - shell: bash - - - name: Fetch sdk - run: | - curl -O -L "https://github.com/V-Sekai/FBXSDK-Darwin/archive/refs/tags/2020.2.zip" - shell: bash - - - name: install 7z extract - run: | - 7z x 2020.2.zip - shell: bash - - - name: move - run: | - mkdir -p sdk - mv ./FBXSDK-Darwin-2020.2/sdk . - shell: bash - - - name: Decompress sdk - run: | - zstd -d -r --rm ./sdk || true - shell: bash - - - name: Conan install - run: | - env CMAKE_OSX_ARCHITECTURES=x86_64 conan install . -i build -s build_type=Release --build missing --settings arch=x86_64 - shell: bash - - - name: Conan build - run: | - env CMAKE_OSX_ARCHITECTURES=x86_64 conan build -bf build . - shell: bash - - - name: Run FBX2glTF help - run: | - ./build/FBX2glTF --help - shell: bash - - - name: Adhoc signature - run: | - codesign -s - --options=runtime build/FBX2glTF - shell: bash - - - uses: actions/upload-artifact@v2 - with: - name: FBX2glTF-macos - path: build/FBX2glTF - - - name: Copy licenses - run: | - mkdir -p result - cp sdk/Darwin/2020.2/License.rtf result/thirdparty-license.rtf - cp LICENSE result/LICENSE - cp build/FBX2glTF result/FBX2glTF - shell: bash - - - name: Archive code coverage results - uses: actions/upload-artifact@v3 - with: - name: macos-x64-64-packages - path: result diff --git a/.github/workflows/build-release.yml b/.github/workflows/build.yaml similarity index 78% rename from .github/workflows/build-release.yml rename to .github/workflows/build.yaml index c685a66..b71454d 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build.yaml @@ -1,5 +1,7 @@ name: "Build FBX2GLTF" on: + branch: + master push: tags: - "v*" @@ -89,16 +91,33 @@ jobs: cp build/Release/FBX2glTF.exe windows-FBX2glTF.exe shell: bash - - uses: "marvinpinto/action-automatic-releases@latest" + - name: Release + uses: softprops/action-gh-release@v1 + if: startsWith(github.ref, 'refs/tags/') with: - repo_token: "${{ secrets.GITHUB_TOKEN }}" - prerelease: false - automatic_release_tag: ${{github.ref_name}} - title: FBX2glTF Windows packages files: | thirdparty-license.rtf LICENSE windows-FBX2glTF.exe + + - name: Archive results + uses: actions/upload-artifact@v3 + with: + name: windows-packages + path: windows-FBX2glTF.exe + + - name: Archive results + uses: actions/upload-artifact@v3 + with: + name: windows-thirdparty-license + path: thirdparty-license.rtf + + - name: Archive results + uses: actions/upload-artifact@v3 + with: + name: windows-license + path: LICENSE + build-ubuntu: runs-on: ubuntu-20.04 steps: @@ -167,11 +186,6 @@ jobs: ./build/FBX2glTF --help shell: bash - - uses: actions/upload-artifact@v2 - with: - name: FBX2glTF-linux - path: build/FBX2glTF - - name: Copy licenses run: | mkdir -p result @@ -179,17 +193,33 @@ jobs: cp build/FBX2glTF linux-FBX2glTF shell: bash - - uses: "marvinpinto/action-automatic-releases@latest" + - name: Release + if: startsWith(github.ref, 'refs/tags/') + uses: softprops/action-gh-release@v1 with: - repo_token: "${{ secrets.GITHUB_TOKEN }}" - prerelease: false - automatic_release_tag: ${{github.ref_name}} - title: FBX2glTF Linux packages files: | thirdparty-license.txt LICENSE linux-FBX2glTF + - name: Archive results + uses: actions/upload-artifact@v3 + with: + name: linux-packages + path: linux-FBX2glTF + + - name: Archive results + uses: actions/upload-artifact@v3 + with: + name: linux-thirdparty-license + path: thirdparty-license.txt + + - name: Archive results + uses: actions/upload-artifact@v3 + with: + name: linux-license + path: LICENSE + build-macos-x86_64: runs-on: macos-11 steps: @@ -266,25 +296,36 @@ jobs: codesign -s - --options=runtime build/FBX2glTF shell: bash - - uses: actions/upload-artifact@v2 - with: - name: FBX2glTF-macos - path: build/FBX2glTF - - name: Copy licenses run: | mkdir -p result cp sdk/Darwin/2020.2/License.rtf thirdparty-license.rtf - cp build/FBX2glTF mac-FBX2glTF + cp build/FBX2glTF macos-FBX2glTF shell: bash - - uses: "marvinpinto/action-automatic-releases@latest" + - name: Release + uses: softprops/action-gh-release@v1 + if: startsWith(github.ref, 'refs/tags/') with: - repo_token: "${{ secrets.GITHUB_TOKEN }}" - automatic_release_tag: ${{github.ref_name}} - prerelease: false - title: FBX2glTF Macos x86_64 packages files: | thirdparty-license.rtf LICENSE - mac-FBX2glTF + macos-FBX2glTF + + - name: Archive results + uses: actions/upload-artifact@v3 + with: + name: macos-packages + path: macos-FBX2glTF.exe + + - name: Archive results + uses: actions/upload-artifact@v3 + with: + name: macos-thirdparty-license + path: thirdparty-license.rtf + + - name: Archive results + uses: actions/upload-artifact@v3 + with: + name: macos-license + path: LICENSE \ No newline at end of file