From 2f8486b43c201490bc02ce32d6bf741dd1683f46 Mon Sep 17 00:00:00 2001 From: sobolevn Date: Mon, 14 Nov 2022 18:24:50 +0300 Subject: [PATCH 1/3] Test apk and arch --- .ci/docker-ci/arch/Dockerfile | 2 +- .github/workflows/release-ci.yml | 4 ++-- .github/workflows/test.yml | 11 ++++------- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.ci/docker-ci/arch/Dockerfile b/.ci/docker-ci/arch/Dockerfile index e14e7b318..815f75505 100644 --- a/.ci/docker-ci/arch/Dockerfile +++ b/.ci/docker-ci/arch/Dockerfile @@ -1,4 +1,4 @@ -FROM archlinux:base-20220529.0.58327 +FROM archlinux:base-20221113.0.102202 LABEL maintainer="mail@sobolevn.me" LABEL vendor="git-secret team" diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml index 32da1c7b1..7621b6c01 100644 --- a/.github/workflows/release-ci.yml +++ b/.github/workflows/release-ci.yml @@ -41,8 +41,8 @@ jobs: release-env: rocky - release-type: rpm release-env: alma - #- release-type: apk # temp removal of alpine releases for #881 - # release-env: alpine # temp removal of alpine releases for #881 + - release-type: apk + release-env: alpine steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9ac8ba62d..1d8a3e3a5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,7 @@ on: - 'docs/**' workflow_dispatch: -concurrency: +concurrency: group: ${{ github.head_ref || github.run_id }}-test cancel-in-progress: true @@ -30,7 +30,7 @@ jobs: docker-env: - alma - alpine - #- arch # disable arch testing for now, see #916 + - arch - debian-gnupg1 # We need to test legacy version of gnupg - debian-gnupg2 - fedora @@ -63,16 +63,13 @@ jobs: with: usesh: true prepare: pkg install -y gnupg bash gmake git gawk - run: | - which -a bash - which -a shell - gmake test + run: gmake test windows-wsl-ci: runs-on: windows-latest steps: - uses: Vampire/setup-wsl@v1 - with: + with: update: 'true' additional-packages: gnupg make man git gawk file - run: git config --global core.autocrlf input From 44edb35ddbf24e0ac61122c81e9f7314f6b5704a Mon Sep 17 00:00:00 2001 From: sobolevn Date: Mon, 14 Nov 2022 18:26:56 +0300 Subject: [PATCH 2/3] Fix ci --- .ci/docker-ci/arch/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/docker-ci/arch/Dockerfile b/.ci/docker-ci/arch/Dockerfile index 815f75505..5b7bb35b0 100644 --- a/.ci/docker-ci/arch/Dockerfile +++ b/.ci/docker-ci/arch/Dockerfile @@ -1,4 +1,4 @@ -FROM archlinux:base-20221113.0.102202 +FROM archlinux/archlinux:base-20221113.0.102202 LABEL maintainer="mail@sobolevn.me" LABEL vendor="git-secret team" From a6ffdd4a4ff31c48751e11735ee480f377bb393d Mon Sep 17 00:00:00 2001 From: sobolevn Date: Mon, 14 Nov 2022 18:36:23 +0300 Subject: [PATCH 3/3] Fix ci --- .github/workflows/build-man.yml | 7 +++++-- .github/workflows/github-pages.yml | 9 +++++++-- .github/workflows/release-ci.yml | 9 ++++++--- .github/workflows/release.yml | 2 +- .github/workflows/test.yml | 5 ++++- 5 files changed, 23 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build-man.yml b/.github/workflows/build-man.yml index 2f2d998aa..c77896556 100644 --- a/.github/workflows/build-man.yml +++ b/.github/workflows/build-man.yml @@ -12,8 +12,11 @@ on: - 'docs/**/*' workflow_dispatch: -concurrency: - group: ${{ github.head_ref || github.run_id }}-build-man +permissions: + contents: read + +concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} cancel-in-progress: true jobs: diff --git a/.github/workflows/github-pages.yml b/.github/workflows/github-pages.yml index c00c0b490..adabdc335 100644 --- a/.github/workflows/github-pages.yml +++ b/.github/workflows/github-pages.yml @@ -9,13 +9,18 @@ on: - 'docs/**/*' - 'utils/*/install.sh' -concurrency: - group: ${{ github.head_ref || github.run_id }} +permissions: + contents: read + +concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} cancel-in-progress: true jobs: build: runs-on: ubuntu-latest + permissions: + contents: write steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml index 7621b6c01..7d6aa6b49 100644 --- a/.github/workflows/release-ci.yml +++ b/.github/workflows/release-ci.yml @@ -21,8 +21,11 @@ on: - 'Makefile' - '.github/workflows/release-ci.yml' +permissions: + contents: read + concurrency: - group: ${{ github.head_ref || github.run_id }} + group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} cancel-in-progress: true jobs: @@ -41,8 +44,8 @@ jobs: release-env: rocky - release-type: rpm release-env: alma - - release-type: apk - release-env: alpine + # - release-type: apk # see #881 + # release-env: alpine steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4bc3ec1e6..adba0ba88 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,7 +7,7 @@ on: workflow_dispatch: concurrency: - group: ${{ github.head_ref || github.run_id }} + group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} jobs: release-packages: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1d8a3e3a5..ee79e84e9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,8 +11,11 @@ on: - 'docs/**' workflow_dispatch: +permissions: + contents: read + concurrency: - group: ${{ github.head_ref || github.run_id }}-test + group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} cancel-in-progress: true jobs: