ci work

wkjarosz · Dec 19, 2024 · 7407da2 · 7407da2
1 parent 41d644f
commit 7407da2
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 22 deletions.
diff --git a/.github/workflows/ci-emscripten.yml b/.github/workflows/ci-emscripten.yml
@@ -42,9 +42,6 @@ jobs:
       - name: ccache
         uses: hendrikmuhs/[email protected]
 
-      - name: Create Build Environment
-        run: cmake -E make_directory ${{github.workspace}}/build
-
       - name: Configure CMake
         run: |
           emcmake cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/build/deploy

diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml
@@ -50,9 +50,6 @@ jobs:
         with:
           key: ${{ matrix.config.os }}-${{ matrix.buildtype }}
 
-      - name: Create Build Environment
-        run: cmake -E make_directory ${{github.workspace}}/build
-
       - name: Configure CMake
         run: |
           cmake -B ${{github.workspace}}/build/${{ matrix.buildtype }} -G Ninja -DCMAKE_BUILD_TYPE=${{ matrix.buildtype }} -DCMAKE_POLICY_DEFAULT_CMP0135=NEW -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DHELLOIMGUI_DOWNLOAD_FREETYPE_IF_NEEDED=ON

diff --git a/.github/workflows/ci-mac.yml b/.github/workflows/ci-mac.yml
@@ -52,9 +52,6 @@ jobs:
         with:
           key: ${{ matrix.config.os }}-${{ matrix.buildtype }}
 
-      - name: Create Build Environment
-        run: cmake -E make_directory ${{github.workspace}}/build
-
       - name: Configure CMake
         run: |
           cmake -B ${{github.workspace}}/build/${{ matrix.buildtype }} -G Ninja -DCMAKE_BUILD_TYPE=${{ matrix.buildtype }} -DCMAKE_POLICY_DEFAULT_CMP0135=NEW -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15

diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml
@@ -42,16 +42,14 @@ jobs:
         run: cmake --build ${{github.workspace}}/build --parallel --config ${{ matrix.buildtype }} --verbose
 
       - name: Checking that HDRView runs
-        # shell: bash
         working-directory: ${{github.workspace}}
         run: ./build/${{ matrix.buildtype }}/HDRView.exe --help
 
       - name: Copy files for archiving
         working-directory: ${{github.workspace}}/build
         run: |
-          cmake -E make_directory deploy
+          cmake -E copy_directory assets deploy/assets/
           cmake -E copy ${{ matrix.buildtype }}/HDRView.exe deploy/
-          cmake -E copy_directory assets deploy/
 
       - name: Archive build artifacts
         uses: actions/upload-artifact@v4

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -91,26 +91,27 @@ jobs:
         run: cmake --build ${{github.workspace}}/build --parallel --config ${{env.BUILD_TYPE}} --verbose
 
       - name: Checking that HDRView runs
-        shell: bash
         working-directory: ${{github.workspace}}
+        run: ./build/${{env.BUILD_TYPE}}/HDRView.exe --help
+
+      - name: Copy files for archiving and release
+        working-directory: ${{github.workspace}}/build
         run: |
-          pwd
-          ./build/${{env.BUILD_TYPE}}/HDRView.exe --help
+          cmake -E copy_directory assets deploy/assets/
+          cmake -E copy ${{env.BUILD_TYPE}}/HDRView.exe deploy/
 
       - name: Archive build artifacts
         uses: actions/upload-artifact@v4
         with:
           name: build-artifacts-windows-latest
           path: |
-            ${{github.workspace}}/build/${{env.BUILD_TYPE}}/HDRView.exe
-            ${{github.workspace}}/build/assets
+            ${{github.workspace}}/build/deploy
 
       - name: Release
         uses: softprops/action-gh-release@v2
         with:
           files: |
-            ${{github.workspace}}/build/${{env.BUILD_TYPE}}/HDRView.exe
-            ${{github.workspace}}/build/assets
+            ${{github.workspace}}/build/deploy
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -136,9 +137,6 @@ jobs:
       - name: ccache
         uses: hendrikmuhs/[email protected]
 
-      - name: Create Build Environment
-        run: cmake -E make_directory ${{github.workspace}}/build
-
       - name: Configure CMake
         run: |
           emcmake cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/build/deploy