From 2411eb664ff47576b7b1e417ce49efd221abd0fd Mon Sep 17 00:00:00 2001 From: jdl Date: Thu, 24 Jul 2025 19:23:50 +0300 Subject: [PATCH 1/3] wrong workflow was being updated --- .github/release.yml | 113 ---------------------------------- .github/workflows/release.yml | 14 +++-- 2 files changed, 8 insertions(+), 119 deletions(-) delete mode 100644 .github/release.yml diff --git a/.github/release.yml b/.github/release.yml deleted file mode 100644 index 2e132ed..0000000 --- a/.github/release.yml +++ /dev/null @@ -1,113 +0,0 @@ -name: Build and Release - -on: - push: - tags: - - 'release/*' - workflow_dispatch: - -jobs: - build-windows: - runs-on: windows-latest - steps: - - name: Checkout code - uses: actions/checkout@v4 - with: - submodules: recursive - fetch-depth: 1 - - - name: Set up Ninja - uses: seanmiddleditch/gha-setup-ninja@v4 - - - name: Set up CMake - uses: jwlawson/actions-setup-cmake@v2 - - - name: Configure - run: cmake -S . -B build -G Ninja - - - name: Build - run: cmake --build build --config Release - - - name: Package - run: | - mkdir -p dist - cp build/assembler.exe dist/ - - - name: Upload artifact - uses: actions/upload-artifact@v4 - with: - name: assembler-windows - path: | - dist/assembler.exe - - build-linux: - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v4 - with: - submodules: recursive - fetch-depth: 1 - - - name: Set up Ninja - uses: seanmiddleditch/gha-setup-ninja@v4 - - - name: Set up CMake - uses: jwlawson/actions-setup-cmake@v2 - - - name: Get version - id: get_version - run: | - version_sha1=$(python3 .github/release.py --version --sha1) - echo "version_sha1=$version_sha1" >> $GITHUB_OUTPUT - - - name: Configure - run: cmake -S . -B build -G Ninja - - - name: Build - run: cmake --build build --config Release - - - name: Package - run: | - mkdir -p dist - cp build/assembler dist/ - echo "${{ steps.get_version.outputs.version_sha1 }}" > dist/version.txt - - - name: Upload artifact - uses: actions/upload-artifact@v4 - with: - name: assembler-linux - path: | - dist/assembler - dist/version.txt - - release: - needs: [build-windows, build-linux] - runs-on: ubuntu-latest - steps: - - name: Download Windows artifact - uses: actions/download-artifact@v4 - with: - name: assembler-windows - path: dist - - - name: Download Linux artifact - uses: actions/download-artifact@v4 - with: - name: assembler-linux - path: dist - - - name: Get version info - run: | - RELEASE_VERSION=$(cat dist/version.txt) - echo "RELEASE_VERSION=${RELEASE_VERSION}" >> $GITHUB_ENV - - - name: Create Release - uses: softprops/action-gh-release@v2 - with: - tag_name: ${{ env.RELEASE_VERSION }} - name: Release ${{ env.RELEASE_VERSION }} - files: | - dist/assembler.exe - dist/assembler - dist/version.txt diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d87f5f9..2e132ed 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,6 +12,9 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v4 + with: + submodules: recursive + fetch-depth: 1 - name: Set up Ninja uses: seanmiddleditch/gha-setup-ninja@v4 @@ -42,6 +45,9 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v4 + with: + submodules: recursive + fetch-depth: 1 - name: Set up Ninja uses: seanmiddleditch/gha-setup-ninja@v4 @@ -52,12 +58,8 @@ jobs: - name: Get version id: get_version run: | - $version = $(python ./.github/release.py --version) - $sha1 = $(python ./.github/release.py --sha1) - $version_sha1 = $(python ./.github/release.py --version --sha1) - echo "version=$version" >> $env:GITHUB_OUTPUT - echo "sha1=sha1" >> $env:GITHUB_OUTPUT - echo "version_sha1=$version_sha1" >> $env:GITHUB_OUTPUT + version_sha1=$(python3 .github/release.py --version --sha1) + echo "version_sha1=$version_sha1" >> $GITHUB_OUTPUT - name: Configure run: cmake -S . -B build -G Ninja From 1c156c4f1f0b8d2ec8cef8d7de2bf30ec71afcdd Mon Sep 17 00:00:00 2001 From: jdl Date: Thu, 24 Jul 2025 19:46:51 +0300 Subject: [PATCH 2/3] Adds a simple build flow --- .github/workflows/build.yml | 48 +++++++++++++++++++++++++++++++++++ .github/workflows/release.yml | 2 +- 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..ed0176d --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,48 @@ +name: Build + +on: + pull_request: + types: [synchronize, opened, reopened, ready_for_review] + +jobs: + build-windows: + runs-on: windows-latest + steps: + - name: Checkout code + uses: actions/checkout@v4 + with: + submodules: recursive + fetch-depth: 1 + + - name: Set up Ninja + uses: seanmiddleditch/gha-setup-ninja@v4 + + - name: Set up CMake + uses: jwlawson/actions-setup-cmake@v2 + + - name: Configure + run: cmake -S . -B build -G Ninja + + - name: Build + run: cmake --build build --config Release + + build-linux: + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v4 + with: + submodules: recursive + fetch-depth: 1 + + - name: Set up Ninja + uses: seanmiddleditch/gha-setup-ninja@v4 + + - name: Set up CMake + uses: jwlawson/actions-setup-cmake@v2 + + - name: Configure + run: cmake -S . -B build -G Ninja + + - name: Build + run: cmake --build build --config Release diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2e132ed..387c822 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,4 +1,4 @@ -name: Build and Release +name: Release on: push: From 17b8a9e290a45e566ea9b1f3357af407f09022a7 Mon Sep 17 00:00:00 2001 From: jdl Date: Thu, 24 Jul 2025 19:50:26 +0300 Subject: [PATCH 3/3] Added missing deps for ubuntu --- .github/workflows/build.yml | 18 ++++++++++++++++-- extern/CMakeLists.txt | 1 - 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ed0176d..bf9abef 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,8 +4,12 @@ on: pull_request: types: [synchronize, opened, reopened, ready_for_review] +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: - build-windows: + windows: runs-on: windows-latest steps: - name: Checkout code @@ -26,7 +30,7 @@ jobs: - name: Build run: cmake --build build --config Release - build-linux: + ubuntu: runs-on: ubuntu-latest steps: - name: Checkout code @@ -41,6 +45,16 @@ jobs: - name: Set up CMake uses: jwlawson/actions-setup-cmake@v2 + - name: install xcb dep + run: | + sudo apt-get update + sudo apt-get install libxcb1-dev -y + + - name: install GL libraries + run: | + sudo apt-get update + sudo apt-get install libgl1-mesa-dev libegl1-mesa-dev -y + - name: Configure run: cmake -S . -B build -G Ninja diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt index 3e77d6a..ccf2448 100644 --- a/extern/CMakeLists.txt +++ b/extern/CMakeLists.txt @@ -110,7 +110,6 @@ add_subdirectory(SPIRV-Cross) set_target_properties( assimp - UpdateAssimpLibsDebugSymbolsAndDLLs zlibstatic glslang GenericCodeGen