diff --git a/.github/workflows/checks.yml b/.github/workflows/_checks.yml similarity index 100% rename from .github/workflows/checks.yml rename to .github/workflows/_checks.yml diff --git a/.github/workflows/ansible.yml b/.github/workflows/ansible.yml index 7f6a5ece2..a6a92c344 100644 --- a/.github/workflows/ansible.yml +++ b/.github/workflows/ansible.yml @@ -3,16 +3,8 @@ name: ansible on: [pull_request, workflow_dispatch] jobs: - prejob: - uses: ./.github/workflows/set-output-workflow.yml - with: - workflow: ${{ github.workflow }} - secrets: - _WORKFLOW: ${{ secrets._CURRENT_TOOL }} - alpine-gnu: - needs: prejob - if: ${{ needs.prejob.outputs.workflow == github.workflow }} + if: ${{ vars.CURRENT_TOOL == github.workflow }} uses: ./.github/workflows/build-alpine.yml with: workflow: ${{ github.workflow }} @@ -20,8 +12,7 @@ jobs: version: 3.18.0 ubuntu-docker: - needs: prejob - if: ${{ needs.prejob.outputs.workflow == github.workflow }} + if: ${{ vars.CURRENT_TOOL == github.workflow }} uses: ./.github/workflows/build-docker.yml with: workflow: ${{ github.workflow }} diff --git a/.github/workflows/bsdtar.yml b/.github/workflows/bsdtar.yml index 349a75641..c6b0e1308 100644 --- a/.github/workflows/bsdtar.yml +++ b/.github/workflows/bsdtar.yml @@ -3,30 +3,21 @@ name: bsdtar on: [pull_request, workflow_dispatch] jobs: - prejob: - uses: ./.github/workflows/set-output-workflow.yml - with: - workflow: ${{ github.workflow }} - secrets: - _WORKFLOW: ${{ secrets._CURRENT_TOOL }} - alpine-musl: - needs: prejob - if: ${{ needs.prejob.outputs.workflow == github.workflow }} + if: ${{ vars.CURRENT_TOOL == github.workflow }} uses: ./.github/workflows/build-alpine.yml with: workflow: ${{ github.workflow }} windows-mingw: - needs: prejob - if: ${{ needs.prejob.outputs.workflow == github.workflow }} + if: ${{ vars.CURRENT_TOOL == github.workflow }} uses: ./.github/workflows/build-windows.yml with: workflow: ${{ github.workflow }} test-alpine: needs: alpine-musl - if: ${{ needs.prejob.outputs.workflow == github.workflow }} + if: ${{ vars.CURRENT_TOOL == github.workflow }} uses: ./.github/workflows/test-alpine.yml with: workflow: ${{ github.workflow }} @@ -34,7 +25,7 @@ jobs: test-ubuntu: needs: alpine-musl - if: ${{ needs.prejob.outputs.workflow == github.workflow }} + if: ${{ vars.CURRENT_TOOL == github.workflow }} uses: ./.github/workflows/test-ubuntu.yml with: workflow: ${{ github.workflow }} @@ -42,7 +33,7 @@ jobs: test-windows: needs: windows-mingw - if: ${{ needs.prejob.outputs.workflow == github.workflow }} + if: ${{ vars.CURRENT_TOOL == github.workflow }} uses: ./.github/workflows/test-windows.yml with: workflow: ${{ github.workflow }} diff --git a/.github/workflows/busybox.yml b/.github/workflows/busybox.yml index 0c8549a0e..6b0146d3d 100644 --- a/.github/workflows/busybox.yml +++ b/.github/workflows/busybox.yml @@ -3,23 +3,14 @@ name: busybox on: [pull_request, workflow_dispatch] jobs: - prejob: - uses: ./.github/workflows/set-output-workflow.yml - with: - workflow: ${{ github.workflow }} - secrets: - _WORKFLOW: ${{ secrets._CURRENT_TOOL }} - alpine-musl: - needs: prejob - if: ${{ needs.prejob.outputs.workflow == github.workflow }} + if: ${{ vars.CURRENT_TOOL == github.workflow }} uses: ./.github/workflows/build-alpine.yml with: workflow: ${{ github.workflow }} alpine-mingw: - needs: prejob - if: ${{ needs.prejob.outputs.workflow == github.workflow }} + if: ${{ vars.CURRENT_TOOL == github.workflow }} uses: ./.github/workflows/build-alpine.yml with: workflow: ${{ github.workflow }} @@ -27,7 +18,7 @@ jobs: test-alpine: needs: alpine-musl - if: ${{ needs.prejob.outputs.workflow == github.workflow }} + if: ${{ vars.CURRENT_TOOL == github.workflow }} uses: ./.github/workflows/test-alpine.yml with: workflow: ${{ github.workflow }} @@ -35,7 +26,7 @@ jobs: test-ubuntu: needs: alpine-musl - if: ${{ needs.prejob.outputs.workflow == github.workflow }} + if: ${{ vars.CURRENT_TOOL == github.workflow }} uses: ./.github/workflows/test-ubuntu.yml with: workflow: ${{ github.workflow }} @@ -43,7 +34,7 @@ jobs: test-windows: needs: alpine-mingw - if: ${{ needs.prejob.outputs.workflow == github.workflow }} + if: ${{ vars.CURRENT_TOOL == github.workflow }} uses: ./.github/workflows/test-windows.yml with: workflow: ${{ github.workflow }} diff --git a/.github/workflows/far2l.yml b/.github/workflows/far2l.yml index c8f950fdb..07e64e9d3 100644 --- a/.github/workflows/far2l.yml +++ b/.github/workflows/far2l.yml @@ -3,31 +3,21 @@ name: far2l on: [pull_request, workflow_dispatch] jobs: - prejob: - uses: ./.github/workflows/set-output-workflow.yml - with: - workflow: ${{ github.workflow }} - secrets: - _WORKFLOW: ${{ secrets._CURRENT_TOOL }} - alpine-musl: - needs: prejob - if: ${{ needs.prejob.outputs.workflow == github.workflow }} + if: ${{ vars.CURRENT_TOOL == github.workflow }} uses: ./.github/workflows/build-alpine.yml with: workflow: ${{ github.workflow }} ubuntu-glibc: - needs: prejob - if: ${{ needs.prejob.outputs.workflow == github.workflow }} + if: ${{ vars.CURRENT_TOOL == github.workflow }} uses: ./.github/workflows/build-ubuntu.yml with: workflow: ${{ github.workflow }} version: 18.04 ubuntu-glibc-p: - needs: prejob - if: ${{ needs.prejob.outputs.workflow == github.workflow }} + if: ${{ vars.CURRENT_TOOL == github.workflow }} uses: ./.github/workflows/build-ubuntu.yml with: workflow: ${{ github.workflow }} diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml index cbce4645c..d11087160 100644 --- a/.github/workflows/mypy.yml +++ b/.github/workflows/mypy.yml @@ -3,30 +3,20 @@ name: mypy on: [pull_request, workflow_dispatch] jobs: - prejob: - uses: ./.github/workflows/set-output-workflow.yml - with: - workflow: ${{ github.workflow }} - secrets: - _WORKFLOW: ${{ secrets._CURRENT_TOOL }} - alpine-musl: - needs: prejob - if: ${{ needs.prejob.outputs.workflow == github.workflow }} + if: ${{ vars.CURRENT_TOOL == github.workflow }} uses: ./.github/workflows/build-alpine.yml with: workflow: ${{ github.workflow }} ubuntu-gnu: - needs: prejob - if: ${{ needs.prejob.outputs.workflow == github.workflow }} + if: ${{ vars.CURRENT_TOOL == github.workflow }} uses: ./.github/workflows/build-ubuntu.yml with: workflow: ${{ github.workflow }} windows-msvc: - needs: prejob - if: ${{ needs.prejob.outputs.workflow == github.workflow }} + if: ${{ vars.CURRENT_TOOL == github.workflow }} uses: ./.github/workflows/build-windows.yml with: workflow: ${{ github.workflow }} diff --git a/.github/workflows/openssl.yml b/.github/workflows/openssl.yml index 0771d96b3..87a7c3309 100644 --- a/.github/workflows/openssl.yml +++ b/.github/workflows/openssl.yml @@ -7,21 +7,8 @@ env: IMAGE_NAME: mcr.microsoft.com/windows/nanoserver:ltsc2022-amd64 jobs: - prejob: - runs-on: ubuntu-latest - environment: release - outputs: - tool: ${{ steps.setvar.outputs.envvar }} - steps: - - id: setvar - run: | - echo ${{ secrets._CURRENT_TOOL }} > CI_ENV - echo "::set-output name=envvar::$(sed -e 's/^_//' CI_ENV)" - - run: echo CURRENT_TOOL '${{ steps.setvar.outputs.envvar }}' - openssl-alpine-musl: - needs: prejob - if: ${{ needs.prejob.outputs.tool=='openssl' }} + if: ${{ vars.CURRENT_TOOL == github.workflow }} runs-on: ubuntu-latest container: alpine:3.15.0 steps: @@ -39,8 +26,7 @@ jobs: ./openssl/release/_musl.tar.gz openssl-alpine-mingw: - needs: prejob - if: ${{ needs.prejob.outputs.tool=='openssl' }} + if: ${{ vars.CURRENT_TOOL == github.workflow }} runs-on: ubuntu-latest container: alpine:3.15.0 steps: diff --git a/.github/workflows/pcre2grep.yml b/.github/workflows/pcre2grep.yml index d05981bbb..3670d35e6 100644 --- a/.github/workflows/pcre2grep.yml +++ b/.github/workflows/pcre2grep.yml @@ -3,23 +3,14 @@ name: pcre2grep on: [pull_request, workflow_dispatch] jobs: - prejob: - uses: ./.github/workflows/set-output-workflow.yml - with: - workflow: ${{ github.workflow }} - secrets: - _WORKFLOW: ${{ secrets._CURRENT_TOOL }} - alpine-musl: - needs: prejob - if: ${{ needs.prejob.outputs.workflow == github.workflow }} + if: ${{ vars.CURRENT_TOOL == github.workflow }} uses: ./.github/workflows/build-alpine.yml with: workflow: ${{ github.workflow }} windows-msvc: - needs: prejob - if: ${{ needs.prejob.outputs.workflow == github.workflow }} + if: ${{ vars.CURRENT_TOOL == github.workflow }} uses: ./.github/workflows/build-windows.yml with: workflow: ${{ github.workflow }} diff --git a/.github/workflows/pg_dump.yml b/.github/workflows/pg_dump.yml index 79d405c0a..db78e6315 100644 --- a/.github/workflows/pg_dump.yml +++ b/.github/workflows/pg_dump.yml @@ -3,23 +3,14 @@ name: pg_dump on: [pull_request, workflow_dispatch] jobs: - prejob: - uses: ./.github/workflows/set-output-workflow.yml - with: - workflow: ${{ github.workflow }} - secrets: - _WORKFLOW: ${{ secrets._CURRENT_TOOL }} - alpine-musl: - needs: prejob - if: ${{ needs.prejob.outputs.workflow == github.workflow }} + if: ${{ vars.CURRENT_TOOL == github.workflow }} uses: ./.github/workflows/build-alpine.yml with: workflow: ${{ github.workflow }} alpine-mingw: - needs: prejob - if: ${{ needs.prejob.outputs.workflow == github.workflow }} + if: ${{ vars.CURRENT_TOOL == github.workflow }} uses: ./.github/workflows/build-alpine.yml with: workflow: ${{ github.workflow }} @@ -27,7 +18,7 @@ jobs: alpine-musl-test: needs: alpine-musl - if: ${{ needs.prejob.outputs.workflow == github.workflow }} + if: ${{ vars.CURRENT_TOOL == github.workflow }} uses: ./.github/workflows/test-alpine.yml with: workflow: ${{ github.workflow }} @@ -35,7 +26,7 @@ jobs: ubuntu-glibc-test: needs: alpine-musl - if: ${{ needs.prejob.outputs.workflow == github.workflow }} + if: ${{ vars.CURRENT_TOOL == github.workflow }} uses: ./.github/workflows/test-ubuntu.yml with: workflow: ${{ github.workflow }} @@ -43,7 +34,7 @@ jobs: windows-mingw-test: needs: alpine-mingw - if: ${{ needs.prejob.outputs.workflow == github.workflow }} + if: ${{ vars.CURRENT_TOOL == github.workflow }} uses: ./.github/workflows/test-windows.yml with: workflow: ${{ github.workflow }} diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml index 085d9a9e6..eca4221f7 100644 --- a/.github/workflows/playwright.yml +++ b/.github/workflows/playwright.yml @@ -4,24 +4,15 @@ name: playwright on: [pull_request, workflow_dispatch] jobs: - prejob: - uses: ./.github/workflows/set-output-workflow.yml - with: - workflow: ${{ github.workflow }} - secrets: - _WORKFLOW: ${{ secrets._CURRENT_TOOL }} - ubuntu-gnu: - needs: prejob - if: ${{ needs.prejob.outputs.workflow == github.workflow }} + if: ${{ vars.CURRENT_TOOL == github.workflow }} uses: ./.github/workflows/build-ubuntu.yml with: workflow: ${{ github.workflow }} toolset: gnu windows-msvc: - needs: prejob - if: ${{ needs.prejob.outputs.workflow == github.workflow }} + if: ${{ vars.CURRENT_TOOL == github.workflow }} uses: ./.github/workflows/build-windows.yml with: workflow: ${{ github.workflow }} diff --git a/.github/workflows/poetry.yml b/.github/workflows/poetry.yml index 5fd6f51d2..8d9d1a58c 100644 --- a/.github/workflows/poetry.yml +++ b/.github/workflows/poetry.yml @@ -3,23 +3,14 @@ name: poetry on: [pull_request, workflow_dispatch] jobs: - prejob: - uses: ./.github/workflows/set-output-workflow.yml - with: - workflow: ${{ github.workflow }} - secrets: - _WORKFLOW: ${{ secrets._CURRENT_TOOL }} - ubuntu-gnu: - needs: prejob - if: ${{ needs.prejob.outputs.workflow == github.workflow }} + if: ${{ vars.CURRENT_TOOL == github.workflow }} uses: ./.github/workflows/build-ubuntu.yml with: workflow: ${{ github.workflow }} windows-msvc: - needs: prejob - if: ${{ needs.prejob.outputs.workflow == github.workflow }} + if: ${{ vars.CURRENT_TOOL == github.workflow }} uses: ./.github/workflows/build-windows.yml with: workflow: ${{ github.workflow }} diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml index e1c142bfd..44bd9daff 100644 --- a/.github/workflows/pylint.yml +++ b/.github/workflows/pylint.yml @@ -3,23 +3,14 @@ name: pylint on: [pull_request, workflow_dispatch] jobs: - prejob: - uses: ./.github/workflows/set-output-workflow.yml - with: - workflow: ${{ github.workflow }} - secrets: - _WORKFLOW: ${{ secrets._CURRENT_TOOL }} - ubuntu-gnu: - needs: prejob - if: ${{ needs.prejob.outputs.workflow == github.workflow }} + if: ${{ vars.CURRENT_TOOL == github.workflow }} uses: ./.github/workflows/build-ubuntu.yml with: workflow: ${{ github.workflow }} windows-msvc: - needs: prejob - if: ${{ needs.prejob.outputs.workflow == github.workflow }} + if: ${{ vars.CURRENT_TOOL == github.workflow }} uses: ./.github/workflows/build-windows.yml with: workflow: ${{ github.workflow }} diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 88c022c17..48c31db3a 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -4,31 +4,21 @@ name: python on: [pull_request, workflow_dispatch] jobs: - prejob: - uses: ./.github/workflows/set-output-workflow.yml - with: - workflow: ${{ github.workflow }} - secrets: - _WORKFLOW: ${{ secrets._CURRENT_TOOL }} - alpine-musl: - needs: prejob - if: ${{ needs.prejob.outputs.workflow == github.workflow }} + if: ${{ vars.CURRENT_TOOL == github.workflow }} uses: ./.github/workflows/build-alpine.yml with: workflow: ${{ github.workflow }} alpine-gnu: - needs: prejob - if: ${{ needs.prejob.outputs.workflow == github.workflow }} + if: ${{ vars.CURRENT_TOOL == github.workflow }} uses: ./.github/workflows/build-alpine.yml with: workflow: ${{ github.workflow }} toolset: gnu windows-msvc: - needs: prejob - if: ${{ needs.prejob.outputs.workflow == github.workflow }} + if: ${{ vars.CURRENT_TOOL == github.workflow }} uses: ./.github/workflows/build-windows.yml with: workflow: ${{ github.workflow }} diff --git a/.github/workflows/set-output-workflow.yml b/.github/workflows/set-output-workflow.yml deleted file mode 100644 index 9ffde1e7b..000000000 --- a/.github/workflows/set-output-workflow.yml +++ /dev/null @@ -1,25 +0,0 @@ -on: - workflow_call: - inputs: - workflow: - required: true - type: string - secrets: - _WORKFLOW: - required: true - outputs: - workflow: - value: ${{ jobs.set-output.outputs.workflow }} - -jobs: - set-output: - runs-on: ubuntu-latest - environment: release - outputs: - workflow: ${{ steps.setvar.outputs.envvar }} - steps: - - id: setvar - run: | - echo ${{ secrets._WORKFLOW }} > CI_ENV - echo "::set-output name=envvar::$(sed -e 's/^_//' CI_ENV)" - - run: echo "workflow:" '${{ inputs.workflow }}', "OUTPUT_WORKFLOW:" '${{ steps.setvar.outputs.envvar }}'