Skip to content

Commit f76bba2

Browse files
committed
Prepare building maintenance branches
1 parent 097c636 commit f76bba2

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

.github/workflows/build.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@ on:
44
push:
55
branches:
66
- master
7+
- 'release/**'
78
pull_request:
89
branches:
910
- master
11+
- 'release/**'
1012

1113
jobs:
1214
test:
@@ -55,7 +57,7 @@ jobs:
5557

5658
# doesn't work with PRs from forks, see https://jira.sonarsource.com/browse/MMF-1371
5759
- name: Build with Maven and run Sonar
58-
if: "${{ (github.ref == 'refs/heads/master' || github.event.pull_request.head.repo.full_name == 'dnsjava/dnsjava') && matrix.arch == 'x64' && matrix.os == 'ubuntu-20.04' && matrix.java == '11' }}"
60+
if: "${{ (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release/') || github.event.pull_request.head.repo.full_name == 'dnsjava/dnsjava') && matrix.arch == 'x64' && matrix.os == 'ubuntu-20.04' && matrix.java == '11' }}"
5961
env:
6062
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6163
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
@@ -66,7 +68,7 @@ jobs:
6668
uses: codecov/codecov-action@v1
6769

6870
release:
69-
if: github.ref == 'refs/heads/master'
71+
if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release/')
7072
needs: test
7173
runs-on: ubuntu-20.04
7274
steps:

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<groupId>dnsjava</groupId>
88
<artifactId>dnsjava</artifactId>
99
<packaging>bundle</packaging>
10-
<version>3.5.0-SNAPSHOT</version>
10+
<version>3.4.2-SNAPSHOT</version>
1111
<name>dnsjava</name>
1212
<description>dnsjava is an implementation of DNS in Java. It supports all defined record types (including the DNSSEC
1313
types), and unknown types. It can be used for queries, zone transfers, and dynamic updates. It includes a cache

0 commit comments

Comments
 (0)