Merge pull request #118 from cschreib/ci

Fix CI scripts not creating the header-only zip correctly
snitch-org · Sep 1, 2023 · 8b28fad · 8b28fad
2 parents 8542d48 + 299dd5f
commit 8b28fad
Showing 1 changed file with 2 additions and 11 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -22,7 +22,7 @@ jobs:
         - { name: Ubuntu GCC noexcept,    os: ubuntu-latest,  publish: false, compiler: g++,     arch: "64", build: "ubuntu64-libstdc++", cmakepp: "",        flags: "-DCMAKE_CXX_COMPILER=g++ -DCMAKE_CXX_FLAGS='-fno-exceptions'"}
         - { name: Ubuntu GCC notime,      os: ubuntu-latest,  publish: false, compiler: g++,     arch: "64", build: "ubuntu64-libstdc++", cmakepp: "",        flags: "-DCMAKE_CXX_COMPILER=g++ -DSNITCH_WITH_TIMINGS=0"}
         - { name: Ubuntu GCC nounity,     os: ubuntu-latest,  publish: false, compiler: g++,     arch: "64", build: "ubuntu64-libstdc++", cmakepp: "",        flags: "-DCMAKE_CXX_COMPILER=g++ -DSNITCH_UNITY_BUILD=0"}
-        - { name: Ubuntu GCC header-only, os: ubuntu-latest,  publish: false, compiler: g++,     arch: "64", build: "ubuntu64-libstdc++", cmakepp: "",        flags: "-DCMAKE_CXX_COMPILER=g++ -DSNITCH_HEADER_ONLY=1"}
+        - { name: Ubuntu GCC header-only, os: ubuntu-latest,  publish: true,  compiler: g++,     arch: "64", build: "header-only",        cmakepp: "",        flags: "-DCMAKE_CXX_COMPILER=g++ -DSNITCH_HEADER_ONLY=1"}
         - { name: Ubuntu GCC shared,      os: ubuntu-latest,  publish: false, compiler: g++,     arch: "64", build: "ubuntu64-libstdc++", cmakepp: "",        flags: "-DCMAKE_CXX_COMPILER=g++ -DBUILD_SHARED_LIBS=1"}
         - { name: Ubuntu Clang,           os: ubuntu-latest,  publish: true,  compiler: clang++, arch: "64", build: "ubuntu64-libc++",    cmakepp: "",        flags: "-DCMAKE_CXX_COMPILER=clang++ -DCMAKE_CXX_FLAGS='-stdlib=libc++'"}
         - { name: Ubuntu Clang noexcept,  os: ubuntu-latest,  publish: false, compiler: clang++, arch: "64", build: "ubuntu64-libc++",    cmakepp: "",        flags: "-DCMAKE_CXX_COMPILER=clang++ -DCMAKE_CXX_FLAGS='-stdlib=libc++ -fno-exceptions'"}
@@ -120,27 +120,18 @@ jobs:
       run: cmake --build . --config ${{matrix.build-type}} --target install
 
     # In action-zip, all paths are relative to ${{github.workspace}}
-    - name: Zip full build
+    - name: Zip build
       if: matrix.build-type == 'Release' && matrix.platform.publish && github.ref == 'refs/heads/main'
       uses: vimtor/action-zip@v1
       with:
         files: install/ LICENSE
         dest: snitch-${{matrix.platform.build}}.zip
 
-    # In action-zip, all paths are relative to ${{github.workspace}}
-    - name: Zip header-only
-      if: matrix.build-type == 'Release' && matrix.platform.publish && github.ref == 'refs/heads/main'
-      uses: vimtor/action-zip@v1
-      with:
-        files: install/include/snitch/snitch_all.hpp LICENSE
-        dest: snitch-header-only.zip
-
     - name: Upload build as an artifact
       if: matrix.build-type == 'Release' && matrix.platform.publish && github.ref == 'refs/heads/main'
       uses: actions/upload-artifact@v2
       with:
         name: snitch-build
         path: |
           ${{github.workspace}}/snitch-${{matrix.platform.build}}.zip
-          ${{github.workspace}}/snitch-header-only.zip