diff --git a/.github/actions/install-zig/action.yml b/.github/actions/install-zig/action.yml index 75d937baeb..d233148baa 100644 --- a/.github/actions/install-zig/action.yml +++ b/.github/actions/install-zig/action.yml @@ -1,12 +1,6 @@ name: 'install-zig' description: 'Install zig compiler and make it available in PATH.' -inputs: - sudo: - description: 'Specify a sudo command. Put it empty when sudo is not available.' - required: false - default: 'sudo' - runs: using: "composite" steps: @@ -14,10 +8,14 @@ runs: shell: bash id: store env: - ZIG_VERSION: '0.14.0-dev.1632+d83a3f174' + ZIG_VERSION: '0.14.0-dev.1952+9f84f7f92' run: | echo "zig_version=${ZIG_VERSION}" >> "$GITHUB_OUTPUT" + - name: Create zig install folder + shell: bash + run: mkdir /usr/local/zig + # TODO: this is only needed because we are using a development version of zig, # since we need https://github.com/ziglang/zig/pull/21253 to be included. # Development versions of zig are not kept alive forever, but get overridden. @@ -48,8 +46,7 @@ runs: EOF chmod +x zig-linux-$(uname -m)-${{ steps.store.outputs.zig_version }}/zig-c++ - ${{ inputs.sudo }} mkdir -p /usr/local/zig/ - ${{ inputs.sudo }} cp -R zig-linux-$(uname -m)-${{ steps.store.outputs.zig_version }}/* /usr/local/zig/ + cp -R zig-linux-$(uname -m)-${{ steps.store.outputs.zig_version }}/* /usr/local/zig/ - name: Setup zig shell: bash diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9fa6b4bb55..fa5e3472f9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -64,8 +64,6 @@ jobs: - name: Install zig if: matrix.name == 'zig' uses: ./.github/actions/install-zig - with: - sudo: '' - name: Build and test ๐Ÿ—๏ธ๐Ÿงช env: diff --git a/.github/workflows/create-comment-kernel-testing.yml b/.github/workflows/create-comment-kernel-testing.yml index 1b7dcb22ad..07f79baca7 100644 --- a/.github/workflows/create-comment-kernel-testing.yml +++ b/.github/workflows/create-comment-kernel-testing.yml @@ -41,7 +41,7 @@ jobs: fs.writeFileSync('${{github.workspace}}/pr.zip', Buffer.from(download.data)); - name: 'Unpack artifact' - run: + run: | if [ -f pr.zip ]; then unzip pr.zip fi diff --git a/cmake/modules/tbb.cmake b/cmake/modules/tbb.cmake index 3e90f04739..c2a3aa49c5 100644 --- a/cmake/modules/tbb.cmake +++ b/cmake/modules/tbb.cmake @@ -80,7 +80,7 @@ else() CMAKE_ARGS -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DTBB_OUTPUT_DIR_BASE=lib - -DCMAKE_CXX_FLAGS="${TBB_FLAGS}" + -DCMAKE_CXX_FLAGS=${TBB_FLAGS} -DCMAKE_POSITION_INDEPENDENT_CODE=${ENABLE_PIC} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}