Skip to content
This repository was archived by the owner on May 15, 2023. It is now read-only.

words matter changes #12

Open
Jimbo4794 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

words matter changes #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Jenkinsfile.docs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ pipeline {
}
sh 'mkdir galasa.dev'
dir('galasa.dev') {
git(url: 'https://github.com/galasa-dev/galasa.dev.git', branch: "master")
git(url: 'https://github.com/galasa-dev/galasa.dev.git', branch: "main")
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions Jenkinsfile.manifests
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ pipeline {

stage('manifest-boot-embedded-latest') {
when {
environment name: 'GIT_BRANCH', value: 'origin/master'
environment name: 'GIT_BRANCH', value: 'origin/main'
}
agent {
label 'docker-amd64'
Expand Down Expand Up @@ -64,7 +64,7 @@ pipeline {

stage('manifest-ras-couchdb-init-latest') {
when {
environment name: 'GIT_BRANCH', value: 'origin/master'
environment name: 'GIT_BRANCH', value: 'origin/main'
}
agent {
label 'docker-amd64'
Expand Down Expand Up @@ -93,7 +93,7 @@ pipeline {

stage('manifest-resources-latest') {
when {
environment name: 'GIT_BRANCH', value: 'origin/master'
environment name: 'GIT_BRANCH', value: 'origin/main'
}
agent {
label 'docker-amd64'
Expand Down Expand Up @@ -122,7 +122,7 @@ pipeline {

stage('manifest-ibm-boot-latest') {
when {
environment name: 'GIT_BRANCH', value: 'origin/master'
environment name: 'GIT_BRANCH', value: 'origin/main'
}
agent {
label 'docker-amd64'
Expand All @@ -138,7 +138,7 @@ pipeline {

stage('manifest-api-bootstrap-latest') {
when {
environment name: 'GIT_BRANCH', value: 'origin/master'
environment name: 'GIT_BRANCH', value: 'origin/main'
}
agent {
label 'docker-amd64'
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ Other repositories are available via [GitHub](https://github.com/galasa-dev).

If you are interested in the development of Galasa, take a look at the documentation and feel free to post a question on [Galasa Slack channel](https://galasa.slack.com) or raise new ideas / features / bugs etc. as issues on [GitHub](https://github.com/galasa-dev/projectmanagement).

Take a look at the [contribution guidelines](https://github.com/galasa-dev/projectmanagement/blob/master/contributing.md).
Take a look at the [contribution guidelines](https://github.com/galasa-dev/projectmanagement/blob/main/contributing.md).

## License

This code is under the [Eclipse Public License 2.0](https://github.com/galasa-dev/maven/blob/master/LICENSE).
This code is under the [Eclipse Public License 2.0](https://github.com/galasa-dev/maven/blob/main/LICENSE).
2 changes: 1 addition & 1 deletion runtime/docker/pull.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ docker pull couchdb:2
echo "Pulling couchdb init"
docker pull galasa/galasa-ras-couchdb-init-amd64:@dockerVersion@

echo "Pulling api master server"
echo "Pulling api main server"
docker pull galasa/galasa-api-bootstrap-amd64:@dockerVersion@

echo "Pulling boot"
Expand Down