From eb5511397f2d7fc082dc2c04912b3fb195e7541d Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Mon, 29 Jul 2024 10:59:52 +0200 Subject: [PATCH 1/6] test workaround for pre-commit --- .github/actions/pre-commit/action.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/actions/pre-commit/action.yml b/.github/actions/pre-commit/action.yml index fa0e877c8..2f9a28cb9 100644 --- a/.github/actions/pre-commit/action.yml +++ b/.github/actions/pre-commit/action.yml @@ -47,6 +47,11 @@ runs: EXTRA_ARGS="${EXTRA_ARGS} ${{ inputs.pre-commit-args }}" echo EXTRA_ARGS="${EXTRA_ARGS}" >> $GITHUB_ENV + - name: Workaround for pypa/setuptools#4519 + shell: bash + run: | + pip3 install -I --force-reinstall setuptools==71.0.0 + - uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1 id: pre-commit env: From 359a73e8f7a177836c6692c5a7167cc980a24b7a Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Mon, 29 Jul 2024 11:02:12 +0200 Subject: [PATCH 2/6] test workaround --- .github/actions/setup-pysemver/action.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/actions/setup-pysemver/action.yml b/.github/actions/setup-pysemver/action.yml index df1d8b82d..00d8ddb65 100644 --- a/.github/actions/setup-pysemver/action.yml +++ b/.github/actions/setup-pysemver/action.yml @@ -8,8 +8,14 @@ inputs: runs: using: "composite" steps: - - run: | - TOOL_VERSION=${{ inputs.version }} + - name: Workaround for pypa/setuptools#4519 + shell: bash + run: | + pip3 install -I --force-reinstall setuptools==71.0.0 + - name: Install pysemver via pip + env: + TOOL_VERSION: ${{ inputs.version }} + run: | pip3 install git+https://github.com/python-semver/python-semver.git@$TOOL_VERSION pysemver --version shell: bash From 7ef21387636df1410aeef54ff661f6d8c515b400 Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Mon, 29 Jul 2024 11:08:17 +0200 Subject: [PATCH 3/6] test workaround --- .github/actions/setup-pysemver/action.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/actions/setup-pysemver/action.yml b/.github/actions/setup-pysemver/action.yml index 00d8ddb65..fbe1d4987 100644 --- a/.github/actions/setup-pysemver/action.yml +++ b/.github/actions/setup-pysemver/action.yml @@ -8,13 +8,10 @@ inputs: runs: using: "composite" steps: - - name: Workaround for pypa/setuptools#4519 - shell: bash - run: | - pip3 install -I --force-reinstall setuptools==71.0.0 - name: Install pysemver via pip env: TOOL_VERSION: ${{ inputs.version }} + PIP_CONSTRAINT: 'setuptools<72.0' # pypa/setuptools#4519 run: | pip3 install git+https://github.com/python-semver/python-semver.git@$TOOL_VERSION pysemver --version From 6754aef7bde05b78870c08aa1328e8497ccdcd2f Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Mon, 29 Jul 2024 11:13:15 +0200 Subject: [PATCH 4/6] test early --- .github/actions/setup-pysemver/action.yml | 1 - .github/workflows/test.yml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/actions/setup-pysemver/action.yml b/.github/actions/setup-pysemver/action.yml index fbe1d4987..a0c123500 100644 --- a/.github/actions/setup-pysemver/action.yml +++ b/.github/actions/setup-pysemver/action.yml @@ -11,7 +11,6 @@ runs: - name: Install pysemver via pip env: TOOL_VERSION: ${{ inputs.version }} - PIP_CONSTRAINT: 'setuptools<72.0' # pypa/setuptools#4519 run: | pip3 install git+https://github.com/python-semver/python-semver.git@$TOOL_VERSION pysemver --version diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 89265c489..f04c6392f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,6 +22,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: ./.github/actions/setup-pysemver # - name: Manual test for send slack notification # uses: ./.github/actions/send-slack-notification # with: @@ -68,7 +69,6 @@ jobs: secret-key: ${{ secrets.RANCHER2_SECRET_KEY }} context: local - uses: ./.github/actions/setup-updatebot - - uses: ./.github/actions/setup-pysemver - uses: ./.github/actions/calculate-next-internal-version with: next-version: 7.3.0 From b9d945632ba7dfddd376bea8fda013d243f900e4 Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Mon, 29 Jul 2024 11:15:09 +0200 Subject: [PATCH 5/6] earlier action --- .github/workflows/test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f04c6392f..bc5187796 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,6 +23,9 @@ jobs: steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - uses: ./.github/actions/setup-pysemver + - uses: ./.github/actions/calculate-next-internal-version + with: + next-version: 7.3.0 # - name: Manual test for send slack notification # uses: ./.github/actions/send-slack-notification # with: @@ -69,9 +72,6 @@ jobs: secret-key: ${{ secrets.RANCHER2_SECRET_KEY }} context: local - uses: ./.github/actions/setup-updatebot - - uses: ./.github/actions/calculate-next-internal-version - with: - next-version: 7.3.0 - uses: ./.github/actions/resolve-preview-name - uses: ./.github/actions/setup-terraform-docs - uses: ./.github/actions/setup-kcadm From efde00f17f08c7a3066f28d1032cca4ebeae8068 Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Mon, 29 Jul 2024 11:17:01 +0200 Subject: [PATCH 6/6] cleanup --- .github/actions/pre-commit/action.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/actions/pre-commit/action.yml b/.github/actions/pre-commit/action.yml index 2f9a28cb9..fa0e877c8 100644 --- a/.github/actions/pre-commit/action.yml +++ b/.github/actions/pre-commit/action.yml @@ -47,11 +47,6 @@ runs: EXTRA_ARGS="${EXTRA_ARGS} ${{ inputs.pre-commit-args }}" echo EXTRA_ARGS="${EXTRA_ARGS}" >> $GITHUB_ENV - - name: Workaround for pypa/setuptools#4519 - shell: bash - run: | - pip3 install -I --force-reinstall setuptools==71.0.0 - - uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1 id: pre-commit env: