Skip to content

Commit b379a50

Browse files
authoredDec 1, 2020
[micrometer] Update common files for branch master (#181)
1 parent f406d22 commit b379a50

File tree

6 files changed

+10
-8
lines changed

6 files changed

+10
-8
lines changed
 

‎.github/workflows/dependency-update.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Check Dependencies
2828
run: ./gradlew useLatestVersions
2929
- name: Create Pull Request
30-
uses: peter-evans/create-pull-request@v3.5.0
30+
uses: peter-evans/create-pull-request@v3.5.1
3131
with:
3232
token: ${{ secrets.GH_TOKEN }}
3333
committer: micronaut-build <${{ secrets.MICRONAUT_BUILD_EMAIL }}>
@@ -36,5 +36,4 @@ jobs:
3636
title: 'Dependency upgrades'
3737
body: Upgrades dependencies to their latest versions
3838
labels: "type: dependency-upgrade"
39-
base: ${{ env.githubBranch }}
4039
branch: dependency-updates

‎.github/workflows/graalvm.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
restore-keys: |
2525
${{ runner.os }}-gradle-
2626
- name: Setup GraalVM CE
27-
uses: DeLaGuardo/setup-graalvm@8bbfe44ef9c6f5c07e5af036a1bffd561c037d18
27+
uses: DeLaGuardo/setup-graalvm@3.0
2828
with:
2929
graalvm-version: ${{ matrix.graalvm }}
3030
- name: Install Native Image

‎.github/workflows/gradle.yml

-1
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,5 @@ jobs:
6363
env:
6464
TARGET_REPOSITORY: ${{ steps.docs_target.outputs.value }}
6565
GH_TOKEN: ${{ secrets.GH_TOKEN }}
66-
BASE_BRANCH: ${{ env.githubBranch }}
6766
BRANCH: gh-pages
6867
FOLDER: build/docs

‎.github/workflows/release-notes.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,17 @@ jobs:
3737
id: release_notes
3838
with:
3939
token: ${{ secrets.GH_TOKEN }}
40-
branch: ${{ env.githubBranch }}
40+
- name: Determine current branch
41+
id: branch
42+
run: |
43+
branch=$(git rev-parse --abbrev-ref HEAD)
44+
echo "Current branch: ${branch}"
45+
echo ::set-output name=branch::${branch}
4146
- uses: ncipollo/release-action@v1
4247
if: steps.check_release_drafter.outputs.has_release_drafter == 'false' && steps.release_notes.outputs.generated_changelog == 'true'
4348
with:
4449
allowUpdates: true
45-
commit: ${{ env.githubBranch }}
50+
commit: ${{ steps.branch.outputs.branch }}
4651
draft: true
4752
name: ${{ env.title }} ${{ steps.release_notes.outputs.next_version }}
4853
tag: v${{ steps.release_notes.outputs.next_version }}

‎.github/workflows/release.yml

-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ jobs:
4343
env:
4444
BETA: ${{ contains(steps.release_version.outputs.release_version, 'M') || contains(steps.release_version.outputs.release_version, 'RC') }}
4545
GH_TOKEN: ${{ secrets.GH_TOKEN }}
46-
BASE_BRANCH: ${{ env.githubBranch }}
4746
BRANCH: gh-pages
4847
FOLDER: build/docs
4948
VERSION: ${{ steps.release_version.outputs.release_version }}
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)
Please sign in to comment.