Try again github actions

ned14 · Aug 14, 2023 · 9ae535a · 9ae535a
1 parent 7fee5aa
commit 9ae535a
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 19 deletions.
diff --git a/.github/workflows/installability.yml b/.github/workflows/installability.yml
@@ -42,14 +42,15 @@ jobs:
          sudo apt-get remove -y libssl-dev
          sudo apt-get autoremove
        fi
+       export CMAKE_CONFIGURE_OPTIONS="-DLLFIO_FORCE_OPENSSL_OFF=On"
        if [ "${{ matrix.configuration }}" = "status_code" ]; then
-         export CMAKE_CONFIGURE_OPTIONS="-DLLFIO_USE_EXPERIMENTAL_SG14_STATUS_CODE=ON"
+         export CMAKE_CONFIGURE_OPTIONS="$CMAKE_CONFIGURE_OPTIONS -DLLFIO_USE_EXPERIMENTAL_SG14_STATUS_CODE=ON"
        fi
        git clone --depth 1 https://github.com/ned14/quickcpplib.git
        pip install --user gitpython
        python quickcpplib/scripts/test_cpp-pm_install.py test-packaging/example.cpp quickcpplib quickcpplib::hl https://github.com/ned14/quickcpplib master outcome outcome::hl https://github.com/ned14/outcome master llfio llfio::sl https://github.com/ned14/llfio develop
        cd test_cpp-pm_install
        mkdir build
        cd build
-       cmake .. -DCMAKE_BUILD_TYPE=Release -DLLFIO_FORCE_OPENSSL_OFF=On $CMAKE_CONFIGURE_OPTIONS
+       cmake .. -DCMAKE_BUILD_TYPE=Release $CMAKE_CONFIGURE_OPTIONS
        cmake --build .
diff --git a/.github/workflows/make_release.yml b/.github/workflows/make_release.yml
@@ -31,23 +31,23 @@ jobs:
          sleep 60
 
       - name: Download Linux artifacts
-        uses: dawidd6/action-download-artifact@v3
+        uses: dawidd6/action-download-artifact@v2
         if: steps.waitforstatuschecks.outputs.status == 'success'
         with:
           github_token: ${{secrets.GITHUB_TOKEN}}
           workflow: unittests_linux.yml
           path: artifacts
 
       - name: Download Mac OS artifacts
-        uses: dawidd6/action-download-artifact@v3
+        uses: dawidd6/action-download-artifact@v2
         if: steps.waitforstatuschecks.outputs.status == 'success'
         with:
           github_token: ${{secrets.GITHUB_TOKEN}}
           workflow: unittests_macos.yml
           path: artifacts
 
       - name: Download Windows artifacts
-        uses: dawidd6/action-download-artifact@v3
+        uses: dawidd6/action-download-artifact@v2
         if: steps.waitforstatuschecks.outputs.status == 'success'
         with:
           github_token: ${{secrets.GITHUB_TOKEN}}

diff --git a/.github/workflows/unittests_linux.yml b/.github/workflows/unittests_linux.yml
@@ -11,8 +11,8 @@ on:
 
 jobs:
   Linux:
-    name: Ubuntu 22.04
-    runs-on: ubuntu-22.04
+    name: Ubuntu 20.04
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
@@ -35,7 +35,10 @@ jobs:
       run: |
        sudo apt-get update
        if [ "${{ matrix.compiler }}" = "libc++" ]; then
-         sudo apt install libc++-dev libc++abi-dev libomp-dev;
+         wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -;
+         sudo add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-11 main";
+         sudo apt update;
+         sudo apt install clang-11 libc++-11-dev libc++abi-11-dev libomp-11-dev;
          export CMAKE_CONFIGURE_OPTIONS="-DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain-linux-libc++.cmake";
        fi
        if [ "${{ matrix.configuration }}" = "status_code" ]; then
@@ -49,14 +52,14 @@ jobs:
        fi
       
     - name: Upload Prebuilt Binaries
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: Linux ${{ matrix.configuration }} ${{ matrix.compiler }} prebuilt binaries
         path: llfio-v2.0-binaries-linux-*.tgz
 
     - name: Upload Test Results
       if: ${{ matrix.compiler != 'arm-linux-gnueabihf-g++' }}
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: Linux ${{ matrix.configuration }} ${{ matrix.compiler }} test results
         path: prebuilt/merged_junit_results.xml
@@ -69,7 +72,7 @@ jobs:
 
     steps:
       - name: Download Artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           path: artifacts
 

diff --git a/.github/workflows/unittests_macos.yml b/.github/workflows/unittests_macos.yml
@@ -32,14 +32,14 @@ jobs:
        ctest -S .ci.cmake -VV -E noexcept --timeout 900 "-DCTEST_CONFIGURE_OPTIONS=$CMAKE_CONFIGURE_OPTIONS"
       
     - name: Upload Prebuilt Binaries
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: Mac OS ${{ matrix.configuration }} prebuilt binaries
         path: llfio-v2.0-binaries-darwin-x64.tgz
 
     - name: Upload Test Results
       if: always()
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: Mac OS ${{ matrix.configuration }} test results
         path: prebuilt/merged_junit_results.xml
@@ -52,7 +52,7 @@ jobs:
 
     steps:
       - name: Download Artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           path: artifacts
 

diff --git a/.github/workflows/unittests_windows.yml b/.github/workflows/unittests_windows.yml
@@ -48,14 +48,14 @@ jobs:
        ctest -S .ci.cmake -VV --timeout 900 "-DCTEST_CONFIGURE_OPTIONS=$CMAKE_CONFIGURE_OPTIONS" -DCTEST_SITE=$NAME -DCTEST_CMAKE_GENERATOR="${{ steps.vars.outputs.GENERATOR }}"
       
     - name: Upload Prebuilt Binaries
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: Windows ${{ steps.vars.outputs.NAME }} ${{ matrix.configuration }} prebuilt binaries
         path: llfio-v2.0-binaries-win64.zip
 
     - name: Upload Test Results
       if: always()
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: Windows ${{ steps.vars.outputs.NAME }} ${{ matrix.configuration }} test results
         path: prebuilt/merged_junit_results.xml
@@ -68,7 +68,7 @@ jobs:
 
     steps:
       - name: Download Artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           path: artifacts
 

diff --git a/cmake/toolchain-linux-libc++.cmake b/cmake/toolchain-linux-libc++.cmake
@@ -1,5 +1,5 @@
-set(CMAKE_C_COMPILER clang)
-set(CMAKE_CXX_COMPILER clang++)
+set(CMAKE_C_COMPILER clang-11)
+set(CMAKE_CXX_COMPILER clang++-11)
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_FLAGS_INIT "-stdlib=libc++ -fcoroutines-ts")
 set(CMAKE_EXE_LINKER_FLAGS_INIT "-stdlib=libc++")