Skip to content

Commit 1d1b079

Browse files
committed
Update workflows for publishing after the release
1 parent 90493bf commit 1d1b079

File tree

8 files changed

+24
-50
lines changed

8 files changed

+24
-50
lines changed

.github/workflows/ci-dev.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
name: Dev CI
22
on:
3+
pull_request:
4+
paths-ignore:
5+
- samples/**
36
push:
47
paths-ignore:
58
- samples/**
6-
branches-ignore:
7-
- master
9+
branches:
10+
- ci/**
811

912
jobs:
1013
test:
1114
uses: ./.github/workflows/run-tests.yml
12-
publish:
13-
needs: [ test ]
14-
uses: ./.github/workflows/publish-snapshot.yml
15-
secrets: inherit
16-
with:
17-
add-branch-suffix: true

.github/workflows/ci-main.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,3 @@ jobs:
1313
needs: [ test ]
1414
uses: ./.github/workflows/publish-snapshot.yml
1515
secrets: inherit
16-
with:
17-
add-branch-suffix: false

.github/workflows/ci-pr.yml

Lines changed: 0 additions & 9 deletions
This file was deleted.

.github/workflows/ci-release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ on:
55
- '*'
66

77
jobs:
8-
# test:
9-
# uses: ./.github/workflows/run-tests.yml
8+
test:
9+
uses: ./.github/workflows/run-tests.yml
1010
publish:
11-
# needs: [ test ]
11+
needs: [ test ]
1212
uses: ./.github/workflows/publish-release.yml
1313
secrets: inherit

.github/workflows/ci-samples.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
os: [ ubuntu-latest, windows-latest, macos-14 ]
17+
os: [ ubuntu-latest, windows-latest, macos-latest ]
1818
sample: [ chat ]
1919
steps:
2020
- uses: actions/checkout@v4

.github/workflows/publish-release.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
name: Publish RELEASE to Maven Central
2-
on:
3-
workflow_call:
2+
on: [ workflow_call ]
43

54
concurrency:
65
group: publish-release
@@ -9,7 +8,7 @@ concurrency:
98
jobs:
109
publish:
1110
if: github.repository == 'rsocket/rsocket-kotlin'
12-
runs-on: macos-14
11+
runs-on: macos-latest
1312
steps:
1413
- uses: actions/checkout@v4
1514
- uses: ./.github/actions/setup-gradle

.github/workflows/publish-snapshot.yml

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,22 @@
1-
name: Publish SNAPSHOT to Github Packages
2-
on:
3-
workflow_call:
4-
inputs:
5-
add-branch-suffix:
6-
type: boolean
7-
required: true
1+
name: Publish SNAPSHOT to Maven Central
2+
on: [ workflow_call ]
83

94
concurrency:
10-
group: publish-snapshot-${{ github.ref_name }}
5+
group: publish-snapshot
116
cancel-in-progress: false
127

138
jobs:
149
publish:
1510
if: github.repository == 'rsocket/rsocket-kotlin'
16-
runs-on: macos-14
11+
runs-on: macos-latest
1712
steps:
1813
- uses: actions/checkout@v4
1914
- uses: ./.github/actions/setup-gradle
2015
with:
21-
cache-read-only: true
22-
23-
- if: inputs.add-branch-suffix
24-
id: set-version
25-
run: |
26-
ref_name=${{ github.ref_name }}
27-
branch_name="${ref_name////-}"
28-
echo "::set-output name=version-suffix::$branch_name"
16+
cache-disabled: true
2917

3018
- name: Publish snapshot to Maven Central
31-
run: ./gradlew publishToMavenCentral -Pversion=0.16.0-${{ steps.set-version.outputs.version-suffix }}-SNAPSHOT --no-configuration-cache
19+
run: ./gradlew publishToMavenCentral -Pversion=0.17.0-SNAPSHOT --no-configuration-cache
3220
env:
3321
ORG_GRADLE_PROJECT_signingInMemoryKey: ${{secrets.signingKey}}
3422
ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{secrets.signingPassword}}

.github/workflows/run-tests.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,30 +12,31 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
os: [ 'ubuntu-latest', 'macos-14', 'windows-latest' ]
15+
os: [ 'ubuntu-latest', 'macos-latest', 'windows-latest' ]
1616
steps:
1717
- uses: actions/checkout@v4
1818
- uses: ./.github/actions/setup-gradle
1919
with:
20-
cache-read-only: ${{ github.ref_name != 'main' }}
20+
cache-read-only: ${{ github.ref_name != 'master' }}
2121

2222
- run: ./gradlew build publishToMavenLocal --continue -Prsocketbuild.skipTests=true
2323

2424
run-tests:
25+
needs: [ build-project ]
2526
runs-on: ${{ matrix.os }}
2627
strategy:
2728
fail-fast: false
2829
matrix:
2930
os: [ 'ubuntu-latest' ]
3031
target: [ 'jvm', 'jvm11', 'jvm17', 'jvm21', 'js', 'native' ]
3132
include:
32-
- os: 'macos-14'
33+
- os: 'macos-latest'
3334
target: 'macos'
34-
- os: 'macos-14'
35+
- os: 'macos-latest'
3536
target: 'ios'
36-
- os: 'macos-14'
37+
- os: 'macos-latest'
3738
target: 'watchos'
38-
- os: 'macos-14'
39+
- os: 'macos-latest'
3940
target: 'tvos'
4041
- os: 'windows-latest'
4142
target: 'native'

0 commit comments

Comments
 (0)