From 6e652c2e44c4b2cd46e7914e099d51fe30f90aba Mon Sep 17 00:00:00 2001 From: csteiner <47841949+clintonsteiner@users.noreply.github.com> Date: Tue, 7 Jan 2025 13:20:56 -0600 Subject: [PATCH] ci: github actions: use runner.temp instead of hardcoded /tmp (#9226) --- .github/actions/call/action.yml | 25 ++++++++++--------------- .github/workflows/benchmark.yml | 31 ++++++++++++++++--------------- 2 files changed, 26 insertions(+), 30 deletions(-) diff --git a/.github/actions/call/action.yml b/.github/actions/call/action.yml index 68616b0441..4e9768af13 100644 --- a/.github/actions/call/action.yml +++ b/.github/actions/call/action.yml @@ -37,8 +37,8 @@ runs: - name: Setup shell: bash run: | - mkdir -p /tmp/actions/call - touch /tmp/actions/call/local-envs + mkdir -p ${{ runner.temp }}/actions/call + touch ${{ runner.temp }}/actions/call/local-envs - name: Install dagger shell: bash @@ -76,9 +76,9 @@ runs: exit 1 fi - # put env variables in /tmp/actions/call/local-envs instead of + # put env variables in ${{ runner.temp }}/actions/call/local-envs instead of # $GITHUB_ENV to avoid leaking into parent workflow - (cd .dagger/mage; go run main.go -w ../.. engine:dev) | tee /tmp/actions/call/local-envs + (cd .dagger/mage; go run main.go -w ../.. engine:dev) | tee ${{ runner.temp }}/actions/call/local-envs echo "::endgroup::" env: @@ -91,7 +91,7 @@ runs: - name: Wait for dagger to be ready shell: bash run: | - source /tmp/actions/call/local-envs + source ${{ runner.temp }}/actions/call/local-envs echo "::group::Dagger client version" dagger --silent version @@ -104,11 +104,11 @@ runs: - name: ${{ inputs.function }} shell: bash run: | - source /tmp/actions/call/local-envs + source ${{ runner.temp }}/actions/call/local-envs function redirect_logs() { if [[ "${{ inputs.upload-logs }}" == "true" ]]; then - "$@" &> /tmp/actions/call/call.log + "$@" &> ${{ runner.temp }}/actions/call/call.log elif [[ -n "${{ inputs.redirect }}" ]]; then "$@" | tee "${{ inputs.redirect }}" else @@ -135,24 +135,19 @@ runs: uses: actions/upload-artifact@v4 with: name: call-logs-${{ runner.name }}-${{ github.job }} - path: /tmp/actions/call/call.log + path: ${{ runner.temp }}/actions/call/call.log overwrite: true - name: Capture dev engine logs if: always() && inputs.dev-engine == 'true' shell: bash run: | - docker logs dagger-engine.dev-${{ runner.name }} &> /tmp/actions/call/engine.log + docker logs dagger-engine.dev-${{ runner.name }} &> ${{ runner.temp }}/actions/call/engine.log - name: Archive engine logs if: always() && inputs.dev-engine == 'true' uses: actions/upload-artifact@v4 with: name: engine-logs-${{ runner.name }} - path: /tmp/actions/call/engine.log + path: ${{ runner.temp }}/actions/call/engine.log overwrite: true - - - name: Cleanup - shell: bash - run: | - rm -rf /tmp/actions/call diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index e46de8ce0f..7d653c0fc6 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -28,8 +28,8 @@ jobs: - name: dagger init (go) shell: bash run: | - mkdir -p /tmp/benchmark - cd /tmp/benchmark + mkdir -p ${{ runner.temp }}/benchmark + cd ${{ runner.temp }}/benchmark dagger init --name=benchmark --sdk=go @@ -37,13 +37,14 @@ jobs: shell: bash run: | dagger functions - working-directory: /tmp/benchmark + working-directory: ${{ runner.temp }}/benchmark - name: dagger functions@cached (go) shell: bash run: | dagger functions - working-directory: /tmp/benchmark + + working-directory: ${{ runner.temp }}/benchmark - name: dagger functions@modified (go) shell: bash @@ -52,7 +53,7 @@ jobs: [ -f "main.go" ] && echo >> main.go dagger functions - working-directory: /tmp/benchmark + working-directory: ${{ runner.temp }}/benchmark benchmark-python: name: Benchmark (Python) @@ -65,8 +66,8 @@ jobs: - name: dagger init (python) shell: bash run: | - mkdir -p /tmp/benchmark - cd /tmp/benchmark + mkdir -p ${{ runner.temp }}/benchmark + cd ${{ runner.temp }}/benchmark dagger init --name=benchmark --sdk=python @@ -74,13 +75,13 @@ jobs: shell: bash run: | dagger functions - working-directory: /tmp/benchmark + working-directory: ${{ runner.temp }}/benchmark - name: dagger functions@cached (python) shell: bash run: | dagger functions - working-directory: /tmp/benchmark + working-directory: ${{ runner.temp }}/benchmark - name: dagger functions@modified (python) shell: bash @@ -89,7 +90,7 @@ jobs: [ -f "src/main/__init__.py" ] && echo >> src/main/__init__.py dagger functions - working-directory: /tmp/benchmark + working-directory: ${{ runner.temp }}/benchmark benchmark-typescript: name: Benchmark (TypeScript::${{ matrix.package-manager }}) @@ -106,8 +107,8 @@ jobs: - name: dagger init (typescript::${{ matrix.package-manager }}) shell: bash run: | - mkdir -p /tmp/benchmark - cd /tmp/benchmark + mkdir -p ${{ runner.temp }}/benchmark + cd ${{ runner.temp }}/benchmark if [ "${{ matrix.package-manager }}" == "pnpm" ]; then cat << EOF > package.json @@ -182,13 +183,13 @@ jobs: shell: bash run: | dagger functions - working-directory: /tmp/benchmark + working-directory: ${{ runner.temp }}/benchmark - name: dagger functions@cached (typescript::${{ matrix.package-manager }}) shell: bash run: | dagger functions - working-directory: /tmp/benchmark + working-directory: ${{ runner.temp }}/benchmark - name: dagger functions@modified (typescript::${{ matrix.package-manager }}) shell: bash @@ -197,4 +198,4 @@ jobs: [ -f "src/index.ts" ] && echo >> src/index.ts dagger functions - working-directory: /tmp/benchmark + working-directory: ${{ runner.temp }}/benchmark