From d3679be7feec5cc6f10398b865aa6540070f280c Mon Sep 17 00:00:00 2001 From: olf Date: Fri, 15 Sep 2023 19:42:05 +0200 Subject: [PATCH] [Workflows] Slighty enhance, primarily comments (#458) * [ci-on-tags.yml] Move comment to its right place * [ci-on-tags.yml] Minor enhancements * [ci-on-pull_req.yml] Beautify * [ci-on-pull_req.yml] Add missing newline --- .github/workflows/ci-on-pull_req.yml | 9 +++++---- .github/workflows/ci-on-tags.yml | 21 +++++++++++---------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci-on-pull_req.yml b/.github/workflows/ci-on-pull_req.yml index bb10d06a..4c35e474 100644 --- a/.github/workflows/ci-on-pull_req.yml +++ b/.github/workflows/ci-on-pull_req.yml @@ -14,15 +14,16 @@ env: defaults: run: - # Note thas 'bash' provides -o pipefail, in contrast to the default (i.e., unspecified, which also uses bash) or 'sh', + # Note that 'bash' provides -o pipefail, in contrast to the default (i.e., unspecified, which also uses bash) or 'sh', # see https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsshell shell: sh +# Do not use concurrency in order to enforce checking every commit of a Pull Request. # See, e.g.: https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#example-only-cancel-in-progress-jobs-or-runs-for-the-current-workflow -concurrency: - group: ci-${{ github.ref_name }} +#concurrency: + #group: ci-${{ github.ref_name }} # 'false' (default) allows for two concurrent runs, one executing and one freshly enqueued; 'true' for only one; no 'concurrency:' defined for multiple. - cancel-in-progress: false + #cancel-in-progress: false jobs: build: diff --git a/.github/workflows/ci-on-tags.yml b/.github/workflows/ci-on-tags.yml index bc7b3f4c..f084527d 100644 --- a/.github/workflows/ci-on-tags.yml +++ b/.github/workflows/ci-on-tags.yml @@ -7,9 +7,9 @@ on: # see https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#filter-pattern-cheat-sheet - '**' # Allows to run this workflow manually from the Actions tab. - workflow_dispatch: + #workflow_dispatch: + # Rather set a new tag in the format N/X.Y.Z (e.g., 1/0.6.3) to build a release originally tagged with 0.6.3 again. -# See, e.g.: https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#example-only-cancel-in-progress-jobs-or-runs-for-the-current-workflow env: # For the latest available docker image, see /~https://github.com/CODeRUS/docker-sailfishos-platform-sdk LATEST: 4.5.0.16 @@ -18,20 +18,21 @@ env: defaults: run: - # Note thas 'bash' provides -o pipefail, in contrast to the default (i.e., unspecified, which also uses bash) or 'sh', + # Note that 'bash' provides -o pipefail, in contrast to the default (i.e., unspecified, which also uses bash) or 'sh', # see https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsshell shell: sh +# See, e.g.: https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#example-only-cancel-in-progress-jobs-or-runs-for-the-current-workflow concurrency: group: ci-${{ github.ref_name }} # 'false' (default) allows for two concurrent runs, one executing and one freshly enqueued; 'true' for only one; no 'concurrency:' defined for multiple. - cancel-in-progress: false + cancel-in-progress: true jobs: - # One job for the latest Docker images used and one for the oldest ones. - # Trying to download three multi-GB, layered docker images in a single job may - # result in "docker: write /var/lib/docker/tmp/GetImageBlobXYZ: no space left on device." - + # One job for the latest Docker image used and one for the oldest one(s). + # Trying to download three multi-GB, layered docker images in a single job usually + # results in "docker: write /var/lib/docker/tmp/GetImageBlobXYZ: no space left on device." + build-on-LATEST: env: RELEASE: ${{ env.LATEST }} @@ -95,7 +96,7 @@ jobs: - name: Upload build results uses: actions/upload-artifact@v3 with: - name: RPM-build-results_${{ env.RELEASE }} + name: RPM-build-results_SDK-for-${{ env.RELEASE }} path: output/ build-on-OLDEST: @@ -150,7 +151,7 @@ jobs: - name: Upload build results uses: actions/upload-artifact@v3 with: - name: RPM-build-results_OLDEST + name: RPM-build-results_SDK-for-OLDEST path: output/ # Due to building two releases for each architecture, they will clobber each other,