From 7a84a0c6837cc4b1d3a0d9f7567591d4fb28d966 Mon Sep 17 00:00:00 2001 From: Oleg Yukhnevich Date: Mon, 23 Nov 2020 18:17:38 +0300 Subject: [PATCH] replace set-env with new gh API --- .github/workflows/gradle-all.yml | 17 +++++++++-------- .github/workflows/gradle-main.yml | 10 ++++++---- .github/workflows/gradle-pr.yml | 5 +++-- .github/workflows/gradle-release.yml | 27 +++++++++++++-------------- 4 files changed, 31 insertions(+), 28 deletions(-) diff --git a/.github/workflows/gradle-all.yml b/.github/workflows/gradle-all.yml index c44f4a89c..f82938aae 100644 --- a/.github/workflows/gradle-all.yml +++ b/.github/workflows/gradle-all.yml @@ -21,7 +21,7 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK + - name: Set up JDK 11 uses: actions/setup-java@v1 with: java-version: 11 @@ -33,7 +33,8 @@ jobs: ~/.konan key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.*') }} #hash based on *.gradle.kts and *.gradle.properties restore-keys: ${{ runner.os }}-gradle - - uses: eskatos/gradle-command-action@v1 + - name: Build and run tests + uses: eskatos/gradle-command-action@v1 with: arguments: build -PmacTargetsCompilation=${{ matrix.macTargetsCompilation }} --scan --no-daemon @@ -47,7 +48,7 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK + - name: Set up JDK 11 uses: actions/setup-java@v1 with: java-version: 11 @@ -59,10 +60,10 @@ jobs: ~/.konan key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.*') }} #hash based on *.gradle.kts and *.gradle.properties restore-keys: ${{ runner.os }}-gradle - - if: ${{ matrix.os == 'windows-latest' }} - run: echo ("::set-env name=BRANCH_NAME::" + $env:GITHUB_REF.replace('refs/heads/', '')) - - if: ${{ matrix.os != 'windows-latest' }} - run: echo "##[set-env name=BRANCH_NAME;]$(echo ${GITHUB_REF#refs/heads/})" - - uses: eskatos/gradle-command-action@v1 + - name: Set BRANCH_NAME for publication + run: echo "BRANCH_NAME=${GITHUB_REF#refs/heads/}" >> $GITHUB_ENV + shell: bash + - name: Publish Packages to Artifactory (version x.y.z-${{ env.BRANCH_NAME }}-SNAPSHOT) + uses: eskatos/gradle-command-action@v1 with: arguments: artifactoryPublish -PbintrayUser=${{ secrets.bintrayUser }} -PbintrayKey=${{ secrets.bintrayKey }} -PversionSuffix=-${{ env.BRANCH_NAME }}-SNAPSHOT -PbuildNumber=${{ github.run_number }} --stacktrace --no-daemon diff --git a/.github/workflows/gradle-main.yml b/.github/workflows/gradle-main.yml index 8dc53bd3b..25f2c3971 100644 --- a/.github/workflows/gradle-main.yml +++ b/.github/workflows/gradle-main.yml @@ -21,7 +21,7 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK + - name: Set up JDK 11 uses: actions/setup-java@v1 with: java-version: 11 @@ -33,7 +33,8 @@ jobs: ~/.konan key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.*') }} #hash based on *.gradle.kts and *.gradle.properties restore-keys: ${{ runner.os }}-gradle - - uses: eskatos/gradle-command-action@v1 + - name: Build and run tests + uses: eskatos/gradle-command-action@v1 with: arguments: build -PmacTargetsCompilation=${{ matrix.macTargetsCompilation }} --scan --no-daemon @@ -47,7 +48,7 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK + - name: Set up JDK 11 uses: actions/setup-java@v1 with: java-version: 11 @@ -59,6 +60,7 @@ jobs: ~/.konan key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.*') }} #hash based on *.gradle.kts and *.gradle.properties restore-keys: ${{ runner.os }}-gradle - - uses: eskatos/gradle-command-action@v1 + - name: Publish Packages to Artifactory (version x.y.z-SNAPSHOT) + uses: eskatos/gradle-command-action@v1 with: arguments: artifactoryPublish -PbintrayUser=${{ secrets.bintrayUser }} -PbintrayKey=${{ secrets.bintrayKey }} -PversionSuffix=-SNAPSHOT -PbuildNumber=${{ github.run_number }} --stacktrace --no-daemon diff --git a/.github/workflows/gradle-pr.yml b/.github/workflows/gradle-pr.yml index 64c0f51ee..d2c8720e9 100644 --- a/.github/workflows/gradle-pr.yml +++ b/.github/workflows/gradle-pr.yml @@ -16,7 +16,7 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK + - name: Set up JDK 11 uses: actions/setup-java@v1 with: java-version: 11 @@ -28,6 +28,7 @@ jobs: ~/.konan key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.*') }} #hash based on *.gradle.kts and *.gradle.properties restore-keys: ${{ runner.os }}-gradle - - uses: eskatos/gradle-command-action@v1 + - name: Build and run tests + uses: eskatos/gradle-command-action@v1 with: arguments: build -PmacTargetsCompilation=${{ matrix.macTargetsCompilation }} --scan --no-daemon diff --git a/.github/workflows/gradle-release.yml b/.github/workflows/gradle-release.yml index 1a471b4ba..0e2ba6d5e 100644 --- a/.github/workflows/gradle-release.yml +++ b/.github/workflows/gradle-release.yml @@ -21,7 +21,7 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK + - name: Set up JDK 11 uses: actions/setup-java@v1 with: java-version: 11 @@ -33,7 +33,8 @@ jobs: ~/.konan key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.*') }} #hash based on *.gradle.kts and *.gradle.properties restore-keys: ${{ runner.os }}-gradle - - uses: eskatos/gradle-command-action@v1 + - name: Build and run tests + uses: eskatos/gradle-command-action@v1 with: arguments: build -PmacTargetsCompilation=${{ matrix.macTargetsCompilation }} --scan --no-daemon @@ -47,7 +48,7 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK + - name: Set up JDK 11 uses: actions/setup-java@v1 with: java-version: 11 @@ -59,11 +60,10 @@ jobs: ~/.konan key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.*') }} #hash based on *.gradle.kts and *.gradle.properties restore-keys: ${{ runner.os }}-gradle - - if: ${{ matrix.os == 'windows-latest' }} - run: echo ("::set-env name=TAG_NAME::" + $env:GITHUB_REF.replace('refs/tags/', '')) - - if: ${{ matrix.os != 'windows-latest' }} - run: echo "##[set-env name=TAG_NAME;]$(echo ${GITHUB_REF#refs/tags/})" - - name: Publish Packages to Bintray + - name: Set TAG_NAME for publication + run: echo "TAG_NAME=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV + shell: bash + - name: Publish Packages to Bintray + JCenter (version ${{ env.TAG_NAME }}) uses: eskatos/gradle-command-action@v1 with: arguments: bintrayUpload -PbintrayUser=${{ secrets.bintrayUser }} -PbintrayKey=${{ secrets.bintrayKey }} -PsonatypeUsername=${{ secrets.sonatypeUsername }} -PsonatypePassword=${{ secrets.sonatypePassword }} -Pversion=${{ env.TAG_NAME }} -PbuildNumber=${{ github.run_number }} --stacktrace --no-daemon @@ -78,7 +78,7 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK + - name: Set up JDK 11 uses: actions/setup-java@v1 with: java-version: 11 @@ -90,11 +90,10 @@ jobs: ~/.konan key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.*') }} #hash based on *.gradle.kts and *.gradle.properties restore-keys: ${{ runner.os }}-gradle - - if: ${{ matrix.os == 'windows-latest' }} - run: echo ("::set-env name=TAG_NAME::" + $env:GITHUB_REF.replace('refs/tags/', '')) - - if: ${{ matrix.os != 'windows-latest' }} - run: echo "##[set-env name=TAG_NAME;]$(echo ${GITHUB_REF#refs/tags/})" - - name: Publish Packages to Bintray + - name: Set TAG_NAME for publication + run: echo "TAG_NAME=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV + shell: bash + - name: Check that packages are published to JCenter (version ${{ env.TAG_NAME }}) uses: eskatos/gradle-command-action@v1 with: arguments: publish-check:build -PpublishCheckVersion=${{ env.TAG_NAME }} --info --no-daemon