Skip to content

Commit 1645aee

Browse files
committed
fix: fix release branch names
1 parent 5241b12 commit 1645aee

File tree

3 files changed

+17
-30
lines changed

3 files changed

+17
-30
lines changed

.github/workflows/continuous-delivery-java8.yml

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ name: Continuous Delivery
55

66
on:
77
push:
8-
branches: [ main ]
8+
branches: [ old-master ]
99

1010
jobs:
1111
build:
@@ -18,27 +18,20 @@ jobs:
1818

1919

2020
steps:
21-
- uses: actions/checkout@v2
22-
- name: Set up JDK 1.8
23-
uses: actions/setup-java@v1
21+
- uses: actions/checkout@v3
22+
- name: Set up JDK 8
23+
uses: actions/setup-java@v3
2424
with:
25-
java-version: 1.8
26-
java-package: jdk+fx
27-
28-
## Enable Caching
29-
- uses: actions/cache@v2
30-
id: cache
31-
with:
32-
path: ~/.m2/repository
33-
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
34-
restore-keys: |
35-
${{ runner.os }}-maven-
25+
java-version: '8'
26+
java-package: 'jdk+fx'
27+
distribution: 'zulu'
28+
cache: 'maven'
3629

3730
- name: Bump version and create tag
3831
id: semanticversion
3932
uses: hennejg/github-tag-action@v4.2.4
4033
with:
41-
release_branches: master
34+
release_branches: old-master
4235
github_token: ${{ secrets.GITHUB_TOKEN }}
4336
tag_prefix: ${{ env.JSCC_TAG_PREFIX }}
4437

.github/workflows/continuous-delivery.yml

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,28 +18,20 @@ jobs:
1818

1919

2020
steps:
21-
- uses: actions/checkout@v2
21+
- uses: actions/checkout@v3
2222
- name: Set up JDK 11
23-
uses: actions/setup-java@v2
23+
uses: actions/setup-java@v3
2424
with:
2525
distribution: 'zulu'
2626
java-version: '11'
27-
java-package: jdk+fx
28-
29-
## Enable Caching
30-
- uses: actions/cache@v2
31-
id: cache
32-
with:
33-
path: ~/.m2/repository
34-
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
35-
restore-keys: |
36-
${{ runner.os }}-maven-
27+
java-package: 'jdk+fx'
28+
cache: 'maven'
3729

3830
- name: Bump version and create tag
3931
id: semanticversion
4032
uses: hennejg/github-tag-action@v4.3.1
4133
with:
42-
release_branches: java11
34+
release_branches: main
4335
github_token: ${{ secrets.GITHUB_TOKEN }}
4436
tag_prefix: ${{ env.JSCC_TAG_PREFIX }}
4537

.github/workflows/continuous-integration.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ name: Continuous Integration
22

33
on:
44
push:
5-
branches-ignore: [ main ]
5+
branches-ignore:
6+
- "main"
7+
- "old-master"
68

79
jobs:
810
build:

0 commit comments

Comments
 (0)