diff --git a/.ci/docker.sh b/.ci/docker.sh index d2f7cf8bd..46112daaa 100644 --- a/.ci/docker.sh +++ b/.ci/docker.sh @@ -165,6 +165,10 @@ function RUN () args+=(--mount "type=bind,source=$CCACHE_DIR,target=/.ccache") args+=(--env "CCACHE_DIR=/.ccache") fi + if [[ $GITHUB_OUTPUT ]]; then + args+=(--mount "type=bind,source=$GITHUB_OUTPUT,target=/gh_output") + args+=(--env "GITHUB_OUTPUT=/gh_output") + fi # shellcheck disable=2086 docker run "${args[@]}" $RUN_ARGS "$IMAGE_NAME" bash "$BUILD_SCRIPT" $RUN_OPTS "$@" return $? diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml index 499db073b..60c216d8d 100644 --- a/.github/workflows/desktop-build.yml +++ b/.github/workflows/desktop-build.yml @@ -196,7 +196,6 @@ jobs: if: matrix.package != 'skip' shell: bash env: - BUILD_DIR: '${{github.workspace}}/build' SUFFIX: '-${{matrix.distro}}${{matrix.version}}' package: '${{matrix.package}}' server_only: '${{matrix.server_only}}' @@ -211,9 +210,8 @@ jobs: fi args+=(--ccache "$CCACHE_SIZE") args+=(--cmake-generator "$CMAKE_GENERATOR") - args+=(--dir "$BUILD_DIR") + args+=(--suffix "$SUFFIX") RUN --server --release --package "$package" "${args[@]}" - .ci/name_build.sh # Delete used cache to emulate a ccache update. See https://github.com/actions/cache/issues/342. - name: Delete remote compiler cache (ccache)