From 81d0dff69a6e4fa7dd9e64cdced04724be692ff3 Mon Sep 17 00:00:00 2001 From: i-walker <46971368+i-walker@users.noreply.github.com> Date: Thu, 26 May 2022 12:58:57 +0200 Subject: [PATCH 1/3] improve set up --- .github/workflows/generate-tag.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/generate-tag.yaml b/.github/workflows/generate-tag.yaml index 4fb34173b32..7a704615c90 100644 --- a/.github/workflows/generate-tag.yaml +++ b/.github/workflows/generate-tag.yaml @@ -2,7 +2,7 @@ name: generate-tag on: workflow_dispatch: - if: github.ref == 'refs/heads/main' + branches: [main] inputs: stage: description: 'Stage' @@ -21,7 +21,6 @@ on: default: 'auto' type: choice options: - - 'patch' - 'minor' - 'major' - 'auto' From 948164a11cddbc12658440e2e6bdc7783c87645e Mon Sep 17 00:00:00 2001 From: i-walker <46971368+i-walker@users.noreply.github.com> Date: Thu, 26 May 2022 13:28:37 +0200 Subject: [PATCH 2/3] revert changes from #2709 --- .github/workflows/generate-alpha-tag.yaml | 4 ++-- .github/workflows/generate-tag.yaml | 4 ++-- .github/workflows/publish.yml | 8 ++++---- .github/workflows/pull_request.yml | 6 +++--- settings.gradle.kts | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/generate-alpha-tag.yaml b/.github/workflows/generate-alpha-tag.yaml index be1adcbbcee..f5540788dca 100644 --- a/.github/workflows/generate-alpha-tag.yaml +++ b/.github/workflows/generate-alpha-tag.yaml @@ -25,7 +25,7 @@ jobs: java-version: 11 - name: Gradle build - uses: gradle/gradle-build-action@v2.1.6 + uses: gradle/gradle-build-action@v2.1.5 with: arguments: --full-stacktrace build "-Psemver.stage=alpha" @@ -52,7 +52,7 @@ jobs: java-version: 11 - name: Generate Tag - uses: gradle/gradle-build-action@v2.1.6 + uses: gradle/gradle-build-action@v2.1.5 with: arguments: --full-stacktrace createSemverTag "-Psemver.stage=alpha" diff --git a/.github/workflows/generate-tag.yaml b/.github/workflows/generate-tag.yaml index 7a704615c90..a3b259c9d3f 100644 --- a/.github/workflows/generate-tag.yaml +++ b/.github/workflows/generate-tag.yaml @@ -45,7 +45,7 @@ jobs: java-version: 11 - name: Gradle build - uses: gradle/gradle-build-action@v2.1.6 + uses: gradle/gradle-build-action@v2.1.5 with: arguments: --full-stacktrace build "-Psemver.scope=${{ github.event.inputs.scope }}" "-Psemver.stage=${{ github.event.inputs.stage }}" @@ -72,7 +72,7 @@ jobs: java-version: 11 - name: Generate Tag - uses: gradle/gradle-build-action@v2.1.6 + uses: gradle/gradle-build-action@v2.1.5 with: arguments: --full-stacktrace createSemverTag "-Psemver.scope=${{ github.event.inputs.scope }}" "-Psemver.stage=${{ github.event.inputs.stage }}" diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 173dc53277b..fc04d824430 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -44,7 +44,7 @@ jobs: java-version: 11 - name: Build - uses: gradle/gradle-build-action@v2.1.6 + uses: gradle/gradle-build-action@v2.1.5 with: arguments: build --full-stacktrace @@ -59,7 +59,7 @@ jobs: path: '**/build/reports/**' - name: Publish alpha/beta/rc version - uses: gradle/gradle-build-action@v2.1.6 + uses: gradle/gradle-build-action@v2.1.5 if: | contains(steps.version.outputs.arrow, 'alpha') || contains(steps.version.outputs.arrow, 'beta') || @@ -68,7 +68,7 @@ jobs: arguments: --full-stacktrace publishToSonatype closeAndReleaseSonatypeStagingRepository - name: Publish final version - uses: gradle/gradle-build-action@v2.1.6 + uses: gradle/gradle-build-action@v2.1.5 if: | !contains(steps.version.outputs.arrow, 'alpha') && !contains(steps.version.outputs.arrow, 'beta') && @@ -85,7 +85,7 @@ jobs: bundle install --gemfile Gemfile - name: Create API doc - uses: gradle/gradle-build-action@v2.1.6 + uses: gradle/gradle-build-action@v2.1.5 with: arguments: --full-stacktrace dokkaGfm diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index e074d2b8597..60ebb96e4fb 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -26,13 +26,13 @@ jobs: java-version: 11 - name: build - uses: gradle/gradle-build-action@v2.1.6 + uses: gradle/gradle-build-action@v2.1.5 if: matrix.os != 'windows-latest' with: arguments: --full-stacktrace build - name: mingwX64Test - uses: gradle/gradle-build-action@v2.1.6 + uses: gradle/gradle-build-action@v2.1.5 if: matrix.os == 'windows-latest' with: arguments: --full-stacktrace mingwX64Test @@ -62,7 +62,7 @@ jobs: java-version: 11 - name: Build - uses: gradle/gradle-build-action@v2.1.6 + uses: gradle/gradle-build-action@v2.1.5 with: arguments: apiDump diff --git a/settings.gradle.kts b/settings.gradle.kts index 292cbd4f7b9..bc4ebecf6d6 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -12,7 +12,7 @@ pluginManagement { } plugins { - id("com.gradle.enterprise") version "3.10.1" + id("com.gradle.enterprise") version "3.10" } dependencyResolutionManagement { From a0d53dc06322bef603b115235ec356753f73cb72 Mon Sep 17 00:00:00 2001 From: i-walker <46971368+i-walker@users.noreply.github.com> Date: Thu, 26 May 2022 13:37:53 +0200 Subject: [PATCH 3/3] Revert "revert changes from #2709" This reverts commit 948164a11cddbc12658440e2e6bdc7783c87645e. --- .github/workflows/generate-alpha-tag.yaml | 4 ++-- .github/workflows/generate-tag.yaml | 4 ++-- .github/workflows/publish.yml | 8 ++++---- .github/workflows/pull_request.yml | 6 +++--- settings.gradle.kts | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/generate-alpha-tag.yaml b/.github/workflows/generate-alpha-tag.yaml index 42d1fa46f37..ed0fa9db264 100644 --- a/.github/workflows/generate-alpha-tag.yaml +++ b/.github/workflows/generate-alpha-tag.yaml @@ -25,7 +25,7 @@ jobs: java-version: 11 - name: Gradle build - uses: gradle/gradle-build-action@v2.1.5 + uses: gradle/gradle-build-action@v2.1.6 with: arguments: --full-stacktrace build "-Psemver.stage=alpha" @@ -52,7 +52,7 @@ jobs: java-version: 11 - name: Generate Tag - uses: gradle/gradle-build-action@v2.1.5 + uses: gradle/gradle-build-action@v2.1.6 with: arguments: --full-stacktrace createSemverTag "-Psemver.stage=alpha" diff --git a/.github/workflows/generate-tag.yaml b/.github/workflows/generate-tag.yaml index 5348124ff1b..170929ee0d0 100644 --- a/.github/workflows/generate-tag.yaml +++ b/.github/workflows/generate-tag.yaml @@ -45,7 +45,7 @@ jobs: java-version: 11 - name: Gradle build - uses: gradle/gradle-build-action@v2.1.5 + uses: gradle/gradle-build-action@v2.1.6 with: arguments: --full-stacktrace build "-Psemver.scope=${{ github.event.inputs.scope }}" "-Psemver.stage=${{ github.event.inputs.stage }}" @@ -72,7 +72,7 @@ jobs: java-version: 11 - name: Generate Tag - uses: gradle/gradle-build-action@v2.1.5 + uses: gradle/gradle-build-action@v2.1.6 with: arguments: --full-stacktrace createSemverTag "-Psemver.scope=${{ github.event.inputs.scope }}" "-Psemver.stage=${{ github.event.inputs.stage }}" diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index d6811126651..72eaa032cc7 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -44,7 +44,7 @@ jobs: java-version: 11 - name: Build - uses: gradle/gradle-build-action@v2.1.5 + uses: gradle/gradle-build-action@v2.1.6 with: arguments: build --full-stacktrace @@ -59,7 +59,7 @@ jobs: path: '**/build/reports/**' - name: Publish alpha/beta/rc version - uses: gradle/gradle-build-action@v2.1.5 + uses: gradle/gradle-build-action@v2.1.6 if: | contains(steps.version.outputs.arrow, 'alpha') || contains(steps.version.outputs.arrow, 'beta') || @@ -68,7 +68,7 @@ jobs: arguments: --full-stacktrace publishToSonatype closeAndReleaseSonatypeStagingRepository - name: Publish final version - uses: gradle/gradle-build-action@v2.1.5 + uses: gradle/gradle-build-action@v2.1.6 if: | !contains(steps.version.outputs.arrow, 'alpha') && !contains(steps.version.outputs.arrow, 'beta') && @@ -85,7 +85,7 @@ jobs: bundle install --gemfile Gemfile - name: Create API doc - uses: gradle/gradle-build-action@v2.1.5 + uses: gradle/gradle-build-action@v2.1.6 with: arguments: --full-stacktrace dokkaGfm diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 70e1b7a7a3a..04940191385 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -26,13 +26,13 @@ jobs: java-version: 11 - name: build - uses: gradle/gradle-build-action@v2.1.5 + uses: gradle/gradle-build-action@v2.1.6 if: matrix.os != 'windows-latest' with: arguments: --full-stacktrace build - name: mingwX64Test - uses: gradle/gradle-build-action@v2.1.5 + uses: gradle/gradle-build-action@v2.1.6 if: matrix.os == 'windows-latest' with: arguments: --full-stacktrace mingwX64Test @@ -62,7 +62,7 @@ jobs: java-version: 11 - name: Build - uses: gradle/gradle-build-action@v2.1.5 + uses: gradle/gradle-build-action@v2.1.6 with: arguments: apiDump diff --git a/settings.gradle.kts b/settings.gradle.kts index bc4ebecf6d6..292cbd4f7b9 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -12,7 +12,7 @@ pluginManagement { } plugins { - id("com.gradle.enterprise") version "3.10" + id("com.gradle.enterprise") version "3.10.1" } dependencyResolutionManagement {