Skip to content

Commit 29c4dd7

Browse files
authored
Merge pull request #1071 from RADAR-base/release-2.1.11
release-2.1.11
2 parents 02a090f + 173ead3 commit 29c4dd7

File tree

4 files changed

+7
-12
lines changed

4 files changed

+7
-12
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ jobs:
103103
- name: Publish to Maven Central
104104
if: steps.is-snapshot.outcome == 'success'
105105
env:
106-
OSSRH_USER: ${{ secrets.OSSRH_USER }}
107-
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
106+
OSSRH_USER: ${{ secrets.OSSRH_USER_TOKEN_ID }}
107+
OSSRH_PASSWORD: ${{ secrets.OSSRH_USER_TOKEN_SECRET }}
108108
run: ./gradlew -Psigning.gnupg.keyName=${{ secrets.OSSRH_GPG_SECRET_KEY_NAME }} -Psigning.gnupg.executable=gpg -Psigning.gnupg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} publish
109109

110110
# Check that the docker image builds correctly

.github/workflows/release.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,9 @@ env:
1212

1313
jobs:
1414
upload:
15-
# The type of runner that the job will run on
1615
runs-on: ubuntu-latest
1716

18-
# Steps represent a sequence of tasks that will be executed as part of the job
1917
steps:
20-
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
2118
- uses: actions/checkout@v3
2219

2320
- name: Use Node.js 16
@@ -40,7 +37,7 @@ jobs:
4037

4138
# Upload it to GitHub
4239
- name: Upload to GitHub
43-
uses: AButler/upload-release-assets@v2.0.2
40+
uses: AButler/upload-release-assets@v3.0
4441
with:
4542
files: '*/build/libs/*'
4643
repo-token: ${{ secrets.GITHUB_TOKEN }}
@@ -52,19 +49,17 @@ jobs:
5249
5350
- name: Publish to Maven Central
5451
env:
55-
OSSRH_USER: ${{ secrets.OSSRH_USER }}
56-
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
52+
OSSRH_USER: ${{ secrets.OSSRH_USER_TOKEN_ID }}
53+
OSSRH_PASSWORD: ${{ secrets.OSSRH_USER_TOKEN_SECRET }}
5754
run: ./gradlew -Psigning.gnupg.keyName=${{ secrets.OSSRH_GPG_SECRET_KEY_NAME }} -Psigning.gnupg.executable=gpg -Psigning.gnupg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} publish closeAndReleaseSonatypeStagingRepository
5855

5956
# Build and push tagged release docker image
6057
docker:
61-
# The type of runner that the job will run on
6258
runs-on: ubuntu-latest
6359
permissions:
6460
contents: read
6561
packages: write
6662

67-
# Steps represent a sequence of tasks that will be executed as part of the job
6863
steps:
6964
- uses: actions/checkout@v3
7065

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ apply plugin: 'io.spring.dependency-management'
3434

3535
allprojects {
3636
group 'org.radarbase'
37-
version '2.1.10' // project version
37+
version '2.1.11' // project version
3838

3939
// The comment on the previous line is only there to identify the project version line easily
4040
// with a sed command, to auto-update the version number with the prepare-release-branch.sh

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "management-portal",
3-
"version": "2.1.10",
3+
"version": "2.1.11",
44
"description": "Description for ManagementPortal",
55
"private": true,
66
"cacheDirectories": [

0 commit comments

Comments
 (0)