Skip to content

Commit

Permalink
Replace as many occurrences as possible of master by main
Browse files Browse the repository at this point in the history
This is a consequence of the renaming of the master branch to main but I
also checked all the external URLs to see if they were changed or not. I
updated them if it was the case.

There are still a some problematic occurrences but they are mostly
related to external projects.
  • Loading branch information
gsmet committed Mar 13, 2021
1 parent f7c0df3 commit adf1beb
Show file tree
Hide file tree
Showing 183 changed files with 298 additions and 296 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/ecosystem-ci-participant-issue.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ assignees: ''

---

This issue will be open and closed dependent on the state of <particpant repo url> building against Quarkus master snapshot.
This issue will be open and closed dependent on the state of <participant repo url> building against Quarkus main snapshot.

If you have interest in being notified of this subscribe to the issue.
4 changes: 3 additions & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ assignees: ''
---

## Description

(Describe the feature here.)

## Implementation ideas
(If you have any implementation ideas, they can go here, however please note that all design change proposals should be posted to [the Quarkus developer mailing list](mailto:[email protected]) (or [the corresponding Google Group](https://groups.google.com/group/quarkus-dev); see [the decisions process document](https://github.com/quarkusio/quarkus/blob/master/DECISIONS.adoc) for more information).

(If you have any implementation ideas, they can go here, however please note that all design change proposals should be posted to [the Quarkus developer mailing list](mailto:[email protected]) (or [the corresponding Google Group](https://groups.google.com/group/quarkus-dev); see [the decisions process document](https://github.com/quarkusio/quarkus/blob/main/DECISIONS.adoc) for more information).
2 changes: 1 addition & 1 deletion .github/quarkusbuilditemdoc.java
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ private void printTableHeader(String title) {
private void printTableRow(Pair<Path, JavaClassSource> pair) {
//TODO: Use tagged version?
Path root = Paths.get(".").toAbsolutePath().normalize();
String link = "https://github.com/quarkusio/quarkus/blob/master/" + root.relativize(pair.getOne().normalize());
String link = "https://github.com/quarkusio/quarkus/blob/main/" + root.relativize(pair.getOne().normalize());
JavaClassSource source = pair.getTwo();
String className = source.getQualifiedName();
String attributes = buildAttributes(source);
Expand Down
64 changes: 32 additions & 32 deletions .github/workflows/ci-actions-incremental.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,17 @@ jobs:
ci-sanity-check:
name: "CI Sanity Check"
runs-on: ubuntu-latest
# Skip master in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/master')"
# Skip main in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
steps:
- name: Build
run: sleep 30
build-jdk11:
name: "Initial JDK 11 Build"
runs-on: ubuntu-latest
# Skip master in forks
# Skip main in forks
# Skip draft PRs and those with WIP in the subject, rerun as soon as its removed
if: "(github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/master')) && ( \
if: "(github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')) && ( \
github.event_name != 'pull_request' || ( \
github.event.pull_request.draft == false && \
github.event.pull_request.state != 'closed' && \
Expand Down Expand Up @@ -131,10 +131,10 @@ jobs:
# - the current branch is a backport branch
GIB_ARGS+=" -Dgib.referenceBranch=origin/$PULL_REQUEST_BASE -Dgib.disableIfBranchRegex='.*backport.*'"
else
# No PR means the merge target is uncertain so fetch & use master of quarkusio/quarkus, *unless*:
# - the current branch is master or some released branch like 1.10
# - the current branch is a backport branch targeting some released branch like 1.10 (merge target is not master)
GIB_ARGS+=" -Dgib.referenceBranch=refs/remotes/quarkusio/master -Dgib.fetchReferenceBranch -Dgib.disableIfBranchRegex='master|\d+\.\d+|.*backport.*'"
# No PR means the merge target is uncertain so fetch & use main of quarkusio/quarkus, *unless*:
# - the current branch is main or some released branch like 1.10
# - the current branch is a backport branch targeting some released branch like 1.10 (merge target is not main)
GIB_ARGS+=" -Dgib.referenceBranch=refs/remotes/quarkusio/main -Dgib.fetchReferenceBranch -Dgib.disableIfBranchRegex='main|\d+\.\d+|.*backport.*'"
fi
echo "GIB_ARGS: $GIB_ARGS"
echo "::set-output name=gib_args::${GIB_ARGS}"
Expand All @@ -144,8 +144,8 @@ jobs:
linux-jvm-tests:
name: JVM Tests - JDK ${{matrix.java.name}}
runs-on: ubuntu-latest
# Skip master in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/master')"
# Skip main in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
needs: build-jdk11
timeout-minutes: 240
env:
Expand Down Expand Up @@ -223,8 +223,8 @@ jobs:
windows-jdk11-jvm-tests:
name: JVM Tests - JDK 11 Windows
runs-on: windows-latest
# Skip master in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/master')"
# Skip main in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
needs: build-jdk11
timeout-minutes: 180
env:
Expand Down Expand Up @@ -269,8 +269,8 @@ jobs:
linux-jvm-maven-tests:
name: Maven Tests - JDK ${{matrix.java.name}}
runs-on: ubuntu-latest
# Skip master in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/master')"
# Skip main in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
needs: build-jdk11
timeout-minutes: 60
strategy:
Expand Down Expand Up @@ -317,8 +317,8 @@ jobs:
windows-jdk11-jvm-maven-tests:
name: Maven Tests - JDK 11 Windows
runs-on: windows-latest
# Skip master in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/master')"
# Skip main in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
needs: build-jdk11
timeout-minutes: 60
strategy:
Expand Down Expand Up @@ -360,8 +360,8 @@ jobs:
linux-jvm-gradle-tests:
name: Gradle Tests - JDK ${{matrix.java.name}}
runs-on: ubuntu-latest
# Skip master in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/master')"
# Skip main in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
needs: build-jdk11
timeout-minutes: 60
strategy:
Expand Down Expand Up @@ -400,8 +400,8 @@ jobs:
windows-jdk11-jvm-gradle-tests:
name: Gradle Tests - JDK 11 Windows
needs: build-jdk11
# Skip master in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/master')"
# Skip main in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
runs-on: windows-latest
timeout-minutes: 80
steps:
Expand Down Expand Up @@ -433,8 +433,8 @@ jobs:
linux-jvm-devtools-tests:
name: Devtools Tests - JDK ${{matrix.java.name}}
runs-on: ubuntu-latest
# Skip master in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/master')"
# Skip main in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
needs: build-jdk11
timeout-minutes: 60
strategy:
Expand Down Expand Up @@ -481,8 +481,8 @@ jobs:
windows-jdk11-jvm-devtools-tests:
name: Devtools Tests - JDK 11 Windows
runs-on: windows-latest
# Skip master in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/master')"
# Skip main in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
needs: build-jdk11
timeout-minutes: 60
strategy:
Expand Down Expand Up @@ -524,8 +524,8 @@ jobs:
tcks-test:
name: MicroProfile TCKs Tests
needs: build-jdk11
# Skip master in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/master')"
# Skip main in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
runs-on: ubuntu-latest
timeout-minutes: 150

Expand Down Expand Up @@ -580,8 +580,8 @@ jobs:
native-tests-read-json-matrix:
name: Native Tests - Read JSON matrix
runs-on: ubuntu-latest
# Skip master in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/master')"
# Skip main in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
outputs:
matrix: ${{ steps.read.outputs.matrix }}
steps:
Expand All @@ -596,8 +596,8 @@ jobs:
name: Native Tests - ${{matrix.category}}
needs: [build-jdk11, native-tests-read-json-matrix]
runs-on: ubuntu-latest
# Skip master in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/master')"
# Skip main in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
# Ignore the following YAML Schema error
timeout-minutes: ${{matrix.timeout}}
strategy:
Expand Down Expand Up @@ -659,8 +659,8 @@ jobs:
name: Native Tests - Windows - ${{matrix.category}}
needs: [build-jdk11, native-tests-read-json-matrix]
runs-on: windows-latest
# Skip master in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/master')"
# Skip main in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
# Ignore the following YAML Schema error
timeout-minutes: ${{matrix.timeout}}
strategy:
Expand Down
52 changes: 26 additions & 26 deletions .github/workflows/ci-actions.yml.disabled
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,17 @@ jobs:
ci-sanity-check:
name: "CI Sanity Check"
runs-on: ubuntu-latest
# Skip master in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/master')"
# Skip main in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
steps:
- name: Build
run: sleep 30
build-jdk11:
name: "Initial JDK 11 Build"
runs-on: ubuntu-latest
# Skip master in forks
# Skip main in forks
# Skip draft PRs and those with WIP in the subject, rerun as soon as its removed
if: "(github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/master')) && ( \
if: "(github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')) && ( \
github.event_name != 'pull_request' || ( \
github.event.pull_request.draft == false && \
github.event.pull_request.state != 'closed' && \
Expand Down Expand Up @@ -116,8 +116,8 @@ jobs:
linux-jvm-tests:
name: JVM Tests - JDK ${{matrix.java.name}}
runs-on: ubuntu-latest
# Skip master in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/master')"
# Skip main in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
needs: build-jdk11
timeout-minutes: 240
env:
Expand Down Expand Up @@ -188,8 +188,8 @@ jobs:
windows-jdk11-jvm-tests:
name: JVM Tests - JDK 11 Windows
runs-on: windows-latest
# Skip master in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/master')"
# Skip main in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
needs: build-jdk11
timeout-minutes: 180
env:
Expand Down Expand Up @@ -229,8 +229,8 @@ jobs:
linux-jvm-maven-tests:
name: Maven Tests - JDK ${{matrix.java.name}}
runs-on: ubuntu-latest
# Skip master in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/master')"
# Skip main in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
needs: build-jdk11
timeout-minutes: 60
strategy:
Expand Down Expand Up @@ -272,8 +272,8 @@ jobs:
windows-jdk11-jvm-maven-tests:
name: Maven Tests - JDK 11 Windows
runs-on: windows-latest
# Skip master in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/master')"
# Skip main in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
needs: build-jdk11
timeout-minutes: 60
strategy:
Expand Down Expand Up @@ -310,8 +310,8 @@ jobs:
linux-jvm-gradle-tests:
name: Gradle Tests - JDK ${{matrix.java.name}}
runs-on: ubuntu-latest
# Skip master in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/master')"
# Skip main in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
needs: build-jdk11
timeout-minutes: 60
strategy:
Expand Down Expand Up @@ -350,8 +350,8 @@ jobs:
windows-jdk11-jvm-gradle-tests:
name: Gradle Tests - JDK 11 Windows
needs: build-jdk11
# Skip master in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/master')"
# Skip main in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
runs-on: windows-latest
timeout-minutes: 80
steps:
Expand Down Expand Up @@ -383,8 +383,8 @@ jobs:
linux-jvm-devtools-tests:
name: Devtools Tests - JDK ${{matrix.java.name}}
runs-on: ubuntu-latest
# Skip master in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/master')"
# Skip main in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
needs: build-jdk11
timeout-minutes: 60
strategy:
Expand Down Expand Up @@ -426,8 +426,8 @@ jobs:
windows-jdk11-jvm-devtools-tests:
name: Devtools Tests - JDK 11 Windows
runs-on: windows-latest
# Skip master in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/master')"
# Skip main in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
needs: build-jdk11
timeout-minutes: 60
strategy:
Expand Down Expand Up @@ -464,8 +464,8 @@ jobs:
tcks-test:
name: MicroProfile TCKs Tests
needs: build-jdk11
# Skip master in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/master')"
# Skip main in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
runs-on: ubuntu-latest
timeout-minutes: 150

Expand Down Expand Up @@ -514,8 +514,8 @@ jobs:
native-tests-read-json-matrix:
name: Native Tests - Read JSON matrix
runs-on: ubuntu-latest
# Skip master in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/master')"
# Skip main in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
outputs:
matrix: ${{ steps.read.outputs.matrix }}
steps:
Expand All @@ -530,8 +530,8 @@ jobs:
name: Native Tests - ${{matrix.category}}
needs: [build-jdk11, native-tests-read-json-matrix]
runs-on: ubuntu-latest
# Skip master in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/master')"
# Skip main in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
# Ignore the following YAML Schema error
timeout-minutes: ${{matrix.timeout}}
strategy:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-fork-mvn-cache.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Quarkus CI Fork Maven Cache
on:
push:
branches:
- 'master'
- 'main'
# paths-ignore should match ci-actions.yml
paths-ignore:
- '.gitignore'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
uses: actions/checkout@v2
with:
fetch-depth: 1
ref: master
ref: main
- name: Setup Java JDK
uses: actions/setup-java@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-snapshots.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
steps:
- uses: actions/checkout@v2
with:
ref: master
ref: main
- name: Reclaim Disk Space
run: .github/ci-prerequisites.sh
- name: Set up JDK 8
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/doc-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ jobs:
build-doc:
name: "Documentation Build"
runs-on: ubuntu-latest
# Skip master in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/master')"
# Skip main in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
steps:
- uses: actions/checkout@v2
- uses: n1hility/cancel-previous-runs@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/native-cron-build.yml.disabled
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
uses: actions/checkout@v2
with:
repository: quarkusio/quarkus
ref: master
ref: main

- uses: actions/cache@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
steps:
- uses: actions/checkout@v2
with:
ref: master
ref: main
- name: Reclaim Disk Space
run: .github/ci-prerequisites.sh
- name: Set up JDK 8
Expand Down
Loading

0 comments on commit adf1beb

Please sign in to comment.