From f3873620a339ef5c6b0cc2602ffe033134a1a300 Mon Sep 17 00:00:00 2001 From: Mary Date: Sun, 28 May 2023 08:08:47 +0200 Subject: [PATCH] actions: Workaround YAML limitation for timeout-minutes Because Github Actions wants an int, we use fromJSON to hack around this. --- .github/workflows/build.yml | 4 ++-- .github/workflows/flatpak.yml | 2 +- .github/workflows/nightly_pr_comment.yml | 2 +- .github/workflows/release.yml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 37b68448c..efd7d2314 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,7 +27,7 @@ jobs: build: name: ${{ matrix.OS_NAME }} (${{ matrix.configuration }}) runs-on: ${{ matrix.os }} - timeout-minutes: ${{ vars.JOB_TIMEOUT }} + timeout-minutes: ${{ fromJSON(vars.JOB_TIMEOUT) }} strategy: matrix: os: [ubuntu-latest, macOS-latest, windows-latest] @@ -110,7 +110,7 @@ jobs: build_macos: name: macOS Universal (${{ matrix.configuration }}) runs-on: ubuntu-latest - timeout-minutes: ${{ vars.JOB_TIMEOUT }} + timeout-minutes: ${{ fromJSON(vars.JOB_TIMEOUT) }} strategy: matrix: configuration: [ Debug, Release ] diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml index 96bc77e16..d4380e05f 100644 --- a/.github/workflows/flatpak.yml +++ b/.github/workflows/flatpak.yml @@ -12,7 +12,7 @@ concurrency: flatpak-release jobs: release: - timeout-minutes: ${{ vars.JOB_TIMEOUT }} + timeout-minutes: ${{ fromJSON(vars.JOB_TIMEOUT) }} runs-on: ubuntu-latest env: diff --git a/.github/workflows/nightly_pr_comment.yml b/.github/workflows/nightly_pr_comment.yml index c7af4acad..deabae670 100644 --- a/.github/workflows/nightly_pr_comment.yml +++ b/.github/workflows/nightly_pr_comment.yml @@ -7,7 +7,7 @@ jobs: pr_comment: if: github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success' runs-on: ubuntu-latest - timeout-minutes: ${{ vars.JOB_TIMEOUT }} + timeout-minutes: ${{ fromJSON(vars.JOB_TIMEOUT) }} steps: - uses: actions/github-script@v6 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4018facab..98ba34822 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -46,7 +46,7 @@ jobs: release: name: Release ${{ matrix.OS_NAME }} runs-on: ${{ matrix.os }} - timeout-minutes: ${{ vars.JOB_TIMEOUT }} + timeout-minutes: ${{ fromJSON(vars.JOB_TIMEOUT) }} strategy: matrix: os: [ ubuntu-latest, windows-latest ] @@ -144,7 +144,7 @@ jobs: macos_release: name: Release MacOS universal runs-on: ubuntu-latest - timeout-minutes: ${{ vars.JOB_TIMEOUT }} + timeout-minutes: ${{ fromJSON(vars.JOB_TIMEOUT) }} steps: - uses: actions/checkout@v3