From a5e2239256feae5f75ade54a956921f759c8570e Mon Sep 17 00:00:00 2001 From: Birajit Saikia Date: Sun, 2 Feb 2025 09:11:22 +0530 Subject: [PATCH 01/35] chore: replace master with main #7126 --- .github/dependabot.yml | 2 +- .github/workflows/compress-images.yaml | 4 ++-- .github/workflows/updatecli.yaml | 2 +- CONTRIBUTING.adoc | 14 +++++++------- Jenkinsfile | 2 +- Jenkinsfile_k8s | 4 ++-- README.adoc | 4 ++-- master_references.txt | 19 +++++++++++++++++++ 8 files changed, 35 insertions(+), 16 deletions(-) create mode 100644 master_references.txt diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 668d0c5aae35..b5be0219514b 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,7 +4,7 @@ updates: # GitHub actions - package-ecosystem: "github-actions" - target-branch: master + target-branch: main directory: "/" schedule: # Check for updates to GitHub Actions every week diff --git a/.github/workflows/compress-images.yaml b/.github/workflows/compress-images.yaml index fdb3321b204c..b1a560bf027c 100644 --- a/.github/workflows/compress-images.yaml +++ b/.github/workflows/compress-images.yaml @@ -1,6 +1,6 @@ # Image Actions will run in the following scenarios: # - on Pull Requests containing images (not including forks) -# - on pushing of images to `master` (for forks) +# - on pushing of images to `main` (for forks) # - on demand (https://github.blog/changelog/2020-07-06-github-actions-manual-triggers-with-workflow_dispatch/) # - at 11 PM every Sunday in anything gets missed with any of the above scenarios # For Pull Requests, the images are added to the PR. @@ -15,7 +15,7 @@ on: - '**.webp' push: branches: - - master + - main paths: - '**.jpg' - '**.jpeg' diff --git a/.github/workflows/updatecli.yaml b/.github/workflows/updatecli.yaml index b1577f4f38eb..203f86683e27 100644 --- a/.github/workflows/updatecli.yaml +++ b/.github/workflows/updatecli.yaml @@ -24,7 +24,7 @@ jobs: UPDATECLI_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Run Updatecli in Apply mode - if: github.ref == 'refs/heads/master' + if: github.ref == 'refs/heads/main' run: updatecli apply --config ./updatecli/updatecli.d --values ./updatecli/values.github-action.yaml env: UPDATECLI_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc index f93ec09c5083..dbffb30b5676 100644 --- a/CONTRIBUTING.adoc +++ b/CONTRIBUTING.adoc @@ -12,10 +12,10 @@ toc::[] To contribute to this repository, follow these steps: -1. link:https://guides.github.com/activities/forking/[Fork this repository] and ensure that you keep only the `master` branch. -2. Create a new branch from your `master` branch and perform your work on this new branch, avoiding direct changes to the `master` branch. +1. link:https://guides.github.com/activities/forking/[Fork this repository] and ensure that you keep only the `main` branch. +2. Create a new branch from your `main` branch and perform your work on this new branch, avoiding direct changes to the `main` branch. 3. Once your work is completed and committed to your branch, push the changes to your forked repository. -4. link:https://help.github.com/articles/creating-a-pull-request-from-a-fork/[Create a pull request (PR)] from your branch to the `master` branch of this repository. +4. link:https://help.github.com/articles/creating-a-pull-request-from-a-fork/[Create a pull request (PR)] from your branch to the `main` branch of this repository. Note that forking needs to be done only once. After forking, you can keep your fork up to date thanks to *Sync fork* or make further changes to your forked repository using the GitHub website file editor or by working on a local clone, as described below. @@ -55,7 +55,7 @@ This group has various communication channels which can be used to discuss contr === Creating a fork Creating a fork, aka link:https://guides.github.com/activities/forking/[forking], makes a personal copy of another repository. -Changes you make in your fork do not show up on the website until they are merged (via PR) to the `master` branch of the repository. +Changes you make in your fork do not show up on the website until they are merged (via PR) to the `main` branch of the repository. If you are unfamiliar with how to create a fork or how forks work, refer to the link:https://guides.github.com/activities/forking/[GitHub tutorial on forking]. === Using GitHub to edit files @@ -424,9 +424,9 @@ For further examples of AsciiDoc source blocks, refer to the link:https://docs.a === Adding an event -To add an event to the Jenkins event calendar, create a file in the `https://github.com/jenkins-infra/jenkins.io/tree/master/content/_data/events[content/_data/events/]` folder of this repo. +To add an event to the Jenkins event calendar, create a file in the `https://github.com/jenkins-infra/jenkins.io/tree/main/content/_data/events[content/_data/events/]` folder of this repo. -To create a file in this folder using the GitHub web editor, link:https://github.com/jenkins-infra/jenkins.io/new/master/content/_data/events[open this page in a new tab]. +To create a file in this folder using the GitHub web editor, link:https://github.com/jenkins-infra/jenkins.io/new/main/content/_data/events[open this page in a new tab]. Name the file using the pattern `-.adoc`: @@ -592,7 +592,7 @@ Note that this file might be out of date or missing some entries, so common sens Notable special areas: * link:https://jenkins.io/project[Governance documents] - Managed by the link:https://www.jenkins.io/project/board/#current-board-members[Governance Board] -* Jenkins core changelogs - Managed by the link:https://github.com/jenkinsci/jenkins/blob/master/docs/MAINTAINERS.adoc#roles[Jenkins core maintainers] +* Jenkins core changelogs - Managed by the link:https://github.com/jenkinsci/jenkins/blob/main/docs/MAINTAINERS.adoc#roles[Jenkins core maintainers] * Security pages and advisories under `jenkins.io/security/` - Managed by the link:https://www.jenkins.io/security/team/[Jenkins Security Team] * Event pages under `jenkins.io/events/` - Managed by event organizers, link:https://www.jenkins.io/sigs/advocacy-and-outreach/[Advocacy and Outreach SIG] and the link:https://www.jenkins.io/project/team-leads/#events[Jenkins Events Officer] * SIG and sub-project pages - Managed by teams diff --git a/Jenkinsfile b/Jenkinsfile index 8833e28e61c3..a191eeb56adb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -34,7 +34,7 @@ node('docker&&linux') { * * * git url: 'git://github.com/jenkinsci/jenkins.io', - * branch: 'master' + * branch: 'main' */ /* diff --git a/Jenkinsfile_k8s b/Jenkinsfile_k8s index 8d21c7a9d8f9..8fa33db2b5c1 100644 --- a/Jenkinsfile_k8s +++ b/Jenkinsfile_k8s @@ -11,7 +11,7 @@ pipeline { } triggers { - cron("${env.BRANCH_NAME == 'master' ? 'H/30 * * * *' : ''}") + cron("${env.BRANCH_NAME == 'main' ? 'H/30 * * * *' : ''}") } options { @@ -46,7 +46,7 @@ pipeline { stage('Deploy to preview site') { when { - changeRequest target: 'master' + changeRequest target: 'main' } environment { NETLIFY_AUTH_TOKEN = credentials('netlify-auth-token') diff --git a/README.adoc b/README.adoc index 21b7b3f83556..6b5817e71125 100644 --- a/README.adoc +++ b/README.adoc @@ -12,6 +12,6 @@ useful and compelling web presence for the link:https://jenkins.io/[Jenkins auto == Contributing If you're interested in contributing to the site, please see our -link:https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc[Contributing document] +link:https://github.com/jenkins-infra/jenkins.io/blob/main/CONTRIBUTING.adoc[Contributing document] -Documentation for Jenkins website maintenance is in the https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc#maintainer-guide[maintainers guidelines]. +Documentation for Jenkins website maintenance is in the https://github.com/jenkins-infra/jenkins.io/blob/main/CONTRIBUTING.adoc#maintainer-guide[maintainers guidelines]. diff --git a/master_references.txt b/master_references.txt new file mode 100644 index 000000000000..2fc447dcff82 --- /dev/null +++ b/master_references.txt @@ -0,0 +1,19 @@ +README.adoc:15:link:https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc[Contributing document] +README.adoc:17:Documentation for Jenkins website maintenance is in the https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc#maintainer-guide[maintainers guidelines]. +CONTRIBUTING.adoc:15:1. link:https://guides.github.com/activities/forking/[Fork this repository] and ensure that you keep only the `master` branch. +CONTRIBUTING.adoc:16:2. Create a new branch from your `master` branch and perform your work on this new branch, avoiding direct changes to the `master` branch. +CONTRIBUTING.adoc:18:4. link:https://help.github.com/articles/creating-a-pull-request-from-a-fork/[Create a pull request (PR)] from your branch to the `master` branch of this repository. +CONTRIBUTING.adoc:58:Changes you make in your fork do not show up on the website until they are merged (via PR) to the `master` branch of the repository. +CONTRIBUTING.adoc:119:Markdown, as opposed to link:https://guides.github.com/features/mastering-markdown/[GitHub flavored Markdown], does not have support for denoting what language source code might be written in. +CONTRIBUTING.adoc:200:For more information, refer to the documentation for link:https://developers.facebook.com/docs/sharing/webmasters/images/[Facebook], and link:https://developer.twitter.com/en/docs/tweets/optimize-with-cards/overview/summary-card-with-large-image.html[Twitter]. +CONTRIBUTING.adoc:427:To add an event to the Jenkins event calendar, create a file in the `https://github.com/jenkins-infra/jenkins.io/tree/master/content/_data/events[content/_data/events/]` folder of this repo. +CONTRIBUTING.adoc:429:To create a file in this folder using the GitHub web editor, link:https://github.com/jenkins-infra/jenkins.io/new/master/content/_data/events[open this page in a new tab]. +CONTRIBUTING.adoc:595:* Jenkins core changelogs - Managed by the link:https://github.com/jenkinsci/jenkins/blob/master/docs/MAINTAINERS.adoc#roles[Jenkins core maintainers] +.github//workflows/compress-images.yaml:3:# - on pushing of images to `master` (for forks) +.github//workflows/compress-images.yaml:18: - master +.github//workflows/updatecli.yaml:27: if: github.ref == 'refs/heads/master' +.github//ISSUE_TEMPLATE/2-wiki-migration.yml:27: For contributors: [Wiki Migration Guidelines](https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc#moving-documentation-from-jenkins-wiki) +.github//ISSUE_TEMPLATE/1-documentation.yml:21: description: Indicate if this is something you would like to work on, and how we can best support you in doing so. More details [on contributing](https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc) +.github//ISSUE_TEMPLATE/3-enhancement.yml:25: description: Indicate if this is something you would like to work on, and how we can best support you in doing so. More details [on contributing](https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc) +.github//ISSUE_TEMPLATE/4-bug.yml:37: description: Indicate if this is something you would like to work on, and how we can best support you in doing so. More details [on contributing](https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc) +.github//dependabot.yml:7: target-branch: master From e6557f495978052d7f4c6ce97ae5b7162dc471da Mon Sep 17 00:00:00 2001 From: Birajit Saikia Date: Sun, 2 Feb 2025 09:28:36 +0530 Subject: [PATCH 02/35] removed automation file for checking master --- master_references.txt | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 master_references.txt diff --git a/master_references.txt b/master_references.txt deleted file mode 100644 index 2fc447dcff82..000000000000 --- a/master_references.txt +++ /dev/null @@ -1,19 +0,0 @@ -README.adoc:15:link:https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc[Contributing document] -README.adoc:17:Documentation for Jenkins website maintenance is in the https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc#maintainer-guide[maintainers guidelines]. -CONTRIBUTING.adoc:15:1. link:https://guides.github.com/activities/forking/[Fork this repository] and ensure that you keep only the `master` branch. -CONTRIBUTING.adoc:16:2. Create a new branch from your `master` branch and perform your work on this new branch, avoiding direct changes to the `master` branch. -CONTRIBUTING.adoc:18:4. link:https://help.github.com/articles/creating-a-pull-request-from-a-fork/[Create a pull request (PR)] from your branch to the `master` branch of this repository. -CONTRIBUTING.adoc:58:Changes you make in your fork do not show up on the website until they are merged (via PR) to the `master` branch of the repository. -CONTRIBUTING.adoc:119:Markdown, as opposed to link:https://guides.github.com/features/mastering-markdown/[GitHub flavored Markdown], does not have support for denoting what language source code might be written in. -CONTRIBUTING.adoc:200:For more information, refer to the documentation for link:https://developers.facebook.com/docs/sharing/webmasters/images/[Facebook], and link:https://developer.twitter.com/en/docs/tweets/optimize-with-cards/overview/summary-card-with-large-image.html[Twitter]. -CONTRIBUTING.adoc:427:To add an event to the Jenkins event calendar, create a file in the `https://github.com/jenkins-infra/jenkins.io/tree/master/content/_data/events[content/_data/events/]` folder of this repo. -CONTRIBUTING.adoc:429:To create a file in this folder using the GitHub web editor, link:https://github.com/jenkins-infra/jenkins.io/new/master/content/_data/events[open this page in a new tab]. -CONTRIBUTING.adoc:595:* Jenkins core changelogs - Managed by the link:https://github.com/jenkinsci/jenkins/blob/master/docs/MAINTAINERS.adoc#roles[Jenkins core maintainers] -.github//workflows/compress-images.yaml:3:# - on pushing of images to `master` (for forks) -.github//workflows/compress-images.yaml:18: - master -.github//workflows/updatecli.yaml:27: if: github.ref == 'refs/heads/master' -.github//ISSUE_TEMPLATE/2-wiki-migration.yml:27: For contributors: [Wiki Migration Guidelines](https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc#moving-documentation-from-jenkins-wiki) -.github//ISSUE_TEMPLATE/1-documentation.yml:21: description: Indicate if this is something you would like to work on, and how we can best support you in doing so. More details [on contributing](https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc) -.github//ISSUE_TEMPLATE/3-enhancement.yml:25: description: Indicate if this is something you would like to work on, and how we can best support you in doing so. More details [on contributing](https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc) -.github//ISSUE_TEMPLATE/4-bug.yml:37: description: Indicate if this is something you would like to work on, and how we can best support you in doing so. More details [on contributing](https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc) -.github//dependabot.yml:7: target-branch: master From c5098c3c26320c98cb43a3a8f8a503bb4bc67088 Mon Sep 17 00:00:00 2001 From: Birajit Saikia Date: Wed, 5 Feb 2025 07:44:11 +0530 Subject: [PATCH 03/35] chore: update issue templates to use main instead of master --- .github/ISSUE_TEMPLATE/1-documentation.yml | 2 +- .github/ISSUE_TEMPLATE/2-wiki-migration.yml | 2 +- .github/ISSUE_TEMPLATE/3-enhancement.yml | 2 +- .github/ISSUE_TEMPLATE/4-bug.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/1-documentation.yml b/.github/ISSUE_TEMPLATE/1-documentation.yml index df2c5282e355..57d505de0125 100644 --- a/.github/ISSUE_TEMPLATE/1-documentation.yml +++ b/.github/ISSUE_TEMPLATE/1-documentation.yml @@ -18,4 +18,4 @@ body: - type: textarea attributes: label: Are you interested in contributing a fix? - description: Indicate if this is something you would like to work on, and how we can best support you in doing so. More details [on contributing](https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc) + description: Indicate if this is something you would like to work on, and how we can best support you in doing so. More details [on contributing](https://github.com/jenkins-infra/jenkins.io/blob/main/CONTRIBUTING.adoc) diff --git a/.github/ISSUE_TEMPLATE/2-wiki-migration.yml b/.github/ISSUE_TEMPLATE/2-wiki-migration.yml index 18174d66f8f4..c187cd4f6fd0 100644 --- a/.github/ISSUE_TEMPLATE/2-wiki-migration.yml +++ b/.github/ISSUE_TEMPLATE/2-wiki-migration.yml @@ -24,4 +24,4 @@ body: id: info attributes: value: | - For contributors: [Wiki Migration Guidelines](https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc#moving-documentation-from-jenkins-wiki) + For contributors: [Wiki Migration Guidelines](https://github.com/jenkins-infra/jenkins.io/blob/main/CONTRIBUTING.adoc#moving-documentation-from-jenkins-wiki) diff --git a/.github/ISSUE_TEMPLATE/3-enhancement.yml b/.github/ISSUE_TEMPLATE/3-enhancement.yml index a268fd24ec36..7cfaba3d670c 100644 --- a/.github/ISSUE_TEMPLATE/3-enhancement.yml +++ b/.github/ISSUE_TEMPLATE/3-enhancement.yml @@ -22,4 +22,4 @@ body: - type: textarea attributes: label: Are you interested in contributing to this improvement? - description: Indicate if this is something you would like to work on, and how we can best support you in doing so. More details [on contributing](https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc) + description: Indicate if this is something you would like to work on, and how we can best support you in doing so. More details [on contributing](https://github.com/jenkins-infra/jenkins.io/blob/main/CONTRIBUTING.adoc) diff --git a/.github/ISSUE_TEMPLATE/4-bug.yml b/.github/ISSUE_TEMPLATE/4-bug.yml index 20dd603241cf..2281f62b04f2 100644 --- a/.github/ISSUE_TEMPLATE/4-bug.yml +++ b/.github/ISSUE_TEMPLATE/4-bug.yml @@ -34,4 +34,4 @@ body: - type: textarea attributes: label: Are you interested in contributing a fix? - description: Indicate if this is something you would like to work on, and how we can best support you in doing so. More details [on contributing](https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc) + description: Indicate if this is something you would like to work on, and how we can best support you in doing so. More details [on contributing](https://github.com/jenkins-infra/jenkins.io/blob/main/CONTRIBUTING.adoc) From 62870d4f2f570755fa969d452558b1a243ef24d6 Mon Sep 17 00:00:00 2001 From: Kevin Martens <99040580+kmartens27@users.noreply.github.com> Date: Wed, 12 Feb 2025 15:15:50 -0500 Subject: [PATCH 04/35] Update frame.html.haml This layout file is using the `master` branch naming, and would need to be updated. However, that may require additional edits/updates to the jenkins-io-components repo as well. That repo houses the header & footer for jenkins.io, among other things. --- content/_layouts/frame.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/_layouts/frame.html.haml b/content/_layouts/frame.html.haml index 6afbd6a5d6c3..d9aeb417761c 100644 --- a/content/_layouts/frame.html.haml +++ b/content/_layouts/frame.html.haml @@ -112,7 +112,7 @@ %jio-footer{:property => "https://www.jenkins.io", :githubRepo => "jenkins-infra/jenkins.io", - :githubBranch => "master", + :githubBranch => "main", :reportAProblemTemplate => "4-bug.yml", :sourcePath=> page.uneditable ? "" : "content#{page.relative_source_path}"} From 1313b2f070bbaca9fb0ccc794ca5c48400e4c287 Mon Sep 17 00:00:00 2001 From: Kevin Martens <99040580+kmartens27@users.noreply.github.com> Date: Wed, 12 Feb 2025 15:17:14 -0500 Subject: [PATCH 05/35] Update main usage This file is also using the master branch naming and would need to be updated. --- content/artwork/index.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/artwork/index.html.haml b/content/artwork/index.html.haml index d18ab304eba7..d6b80a7d852b 100644 --- a/content/artwork/index.html.haml +++ b/content/artwork/index.html.haml @@ -120,7 +120,7 @@ title: Jenkins Artwork Adding a Logo %p In order to add a new logo, please refer to the - %a{:href => 'https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc#adding-a-logo'} + %a{:href => 'https://github.com/jenkins-infra/jenkins.io/blob/main/CONTRIBUTING.adoc#adding-a-logo'} CONTRIBUTING guidelines. = partial('anchors.html.haml', :selector => '.artwork-container'); From 5328fa0719d1448fe83eca0ebc6c255e942ef7db Mon Sep 17 00:00:00 2001 From: Kevin Martens <99040580+kmartens27@users.noreply.github.com> Date: Wed, 12 Feb 2025 15:27:50 -0500 Subject: [PATCH 06/35] Update index.html.haml This would need to be updated for main as well. --- content/changelog/index.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/changelog/index.html.haml b/content/changelog/index.html.haml index 219b5fc52664..648cbed82079 100644 --- a/content/changelog/index.html.haml +++ b/content/changelog/index.html.haml @@ -6,7 +6,7 @@ has_rss: true --- .ratings - - # source: https://github.com/jenkins-infra/jenkins.io/blob/master/content/_data/changelogs/weekly.yml + - # source: https://github.com/jenkins-infra/jenkins.io/blob/main/content/_data/changelogs/weekly.yml - site.changelogs[:weekly].reverse.select { |release| Gem::Version.new(release.version) <= Gem::Version.new(site.jenkins.latest) }[0..29].each do | release | = partial('release-header.html.haml', :release => release, :url => 'changelog') %div.app-releases__list__items From 04778ce5b8cd672603dd73f9adea93d6c8d3c62f Mon Sep 17 00:00:00 2001 From: Kevin Martens <99040580+kmartens27@users.noreply.github.com> Date: Wed, 12 Feb 2025 15:28:09 -0500 Subject: [PATCH 07/35] Update index.html.haml --- content/changelog-old/index.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/changelog-old/index.html.haml b/content/changelog-old/index.html.haml index 27654f5048cf..88d8c5f35ee9 100644 --- a/content/changelog-old/index.html.haml +++ b/content/changelog-old/index.html.haml @@ -11,7 +11,7 @@ show_ratings: false here. .ratings - - # source: https://github.com/jenkins-infra/jenkins.io/blob/master/content/_data/changelogs/weekly.yml + - # source: https://github.com/jenkins-infra/jenkins.io/blob/main/content/_data/changelogs/weekly.yml - site.changelogs[:weekly].reverse.select { |release| Gem::Version.new(release.version) <= Gem::Version.new(site.jenkins.latest) }[30..-1].each do | release | = partial('release-header.html.haml', :release => release) %div.app-releases__list__items From 1287f61db9808084de217fbc88f51dc0aee8e3cc Mon Sep 17 00:00:00 2001 From: Kevin Martens <99040580+kmartens27@users.noreply.github.com> Date: Wed, 12 Feb 2025 15:28:35 -0500 Subject: [PATCH 08/35] Update index.html.haml --- content/changelog-preview/index.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/changelog-preview/index.html.haml b/content/changelog-preview/index.html.haml index 5b2e100eb3e3..e80a2ce4c2ce 100644 --- a/content/changelog-preview/index.html.haml +++ b/content/changelog-preview/index.html.haml @@ -17,7 +17,7 @@ has_rss: true . .ratings - - # source: https://github.com/jenkins-infra/jenkins.io/blob/master/content/_data/changelogs/weekly.yml + - # source: https://github.com/jenkins-infra/jenkins.io/blob/main/content/_data/changelogs/weekly.yml - counter = 0 - site.changelogs[:weekly].reverse.select { |release| Gem::Version.new(release.version) > Gem::Version.new(site.jenkins.latest) }[0..29].each do | release | = partial('release-header.html.haml', :release => release) From e2bd4a1790d09d97de437cd3eb1b2d6c853e0bbb Mon Sep 17 00:00:00 2001 From: Kevin Martens <99040580+kmartens27@users.noreply.github.com> Date: Wed, 12 Feb 2025 15:31:01 -0500 Subject: [PATCH 09/35] Update kubernetes installation guide for main This installation guide would need updates from master to main --- content/doc/book/installing/_kubernetes.adoc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/content/doc/book/installing/_kubernetes.adoc b/content/doc/book/installing/_kubernetes.adoc index d6fae68b8012..6bcd996b7150 100644 --- a/content/doc/book/installing/_kubernetes.adoc +++ b/content/doc/book/installing/_kubernetes.adoc @@ -43,7 +43,7 @@ We choose to use the `/data` directory. This directory will contain our Jenkins *We will create a volume which is called jenkins-pv:* -. Paste the content from link:https://raw.githubusercontent.com/jenkins-infra/jenkins.io/master/content/doc/tutorials/kubernetes/installing-jenkins-on-kubernetes/jenkins-volume.yaml[https://raw.githubusercontent.com/installing-jenkins-on-kubernetes/jenkins-volume.yaml] into a YAML formatted file called `jenkins-volume.yaml`. +. Paste the content from link:https://raw.githubusercontent.com/jenkins-infra/jenkins.io/main/content/doc/tutorials/kubernetes/installing-jenkins-on-kubernetes/jenkins-volume.yaml[https://raw.githubusercontent.com/installing-jenkins-on-kubernetes/jenkins-volume.yaml] into a YAML formatted file called `jenkins-volume.yaml`. . Run the following command to apply the spec: + [source,bash] @@ -96,7 +96,7 @@ A RoleBinding may reference any Role in the same namespace. Alternatively, a RoleBinding can reference a ClusterRole and bind that ClusterRole to the namespace of the RoleBinding. To bind a ClusterRole to all the namespaces in our cluster, we use a ClusterRoleBinding. -. Paste the content from link:https://raw.githubusercontent.com/jenkins-infra/jenkins.io/master/content/doc/tutorials/kubernetes/installing-jenkins-on-kubernetes/jenkins-sa.yaml[https://raw.githubusercontent.com/installing-jenkins-on-kubernetes/jenkins-sa.yaml] into a YAML formatted file called +. Paste the content from link:https://raw.githubusercontent.com/jenkins-infra/jenkins.io/main/content/doc/tutorials/kubernetes/installing-jenkins-on-kubernetes/jenkins-sa.yaml[https://raw.githubusercontent.com/installing-jenkins-on-kubernetes/jenkins-sa.yaml] into a YAML formatted file called `jenkins-sa.yaml`. + . Run the following command to apply the spec: @@ -282,9 +282,9 @@ The YAML files are easily tracked, edited, and can be reused indefinitely. === Create Jenkins deployment file -Copy the contents link:https://raw.githubusercontent.com/jenkins-infra/jenkins.io/master/content/doc/tutorials/kubernetes/installing-jenkins-on-kubernetes/jenkins-deployment.yaml[here] into your preferred text editor and create a jenkins-deployment.yaml file in the “jenkins” namespace we created in this link:/doc/book/installing/kubernetes/#create-a-namespace[section] above. +Copy the contents link:https://raw.githubusercontent.com/jenkins-infra/jenkins.io/main/content/doc/tutorials/kubernetes/installing-jenkins-on-kubernetes/jenkins-deployment.yaml[here] into your preferred text editor and create a jenkins-deployment.yaml file in the “jenkins” namespace we created in this link:/doc/book/installing/kubernetes/#create-a-namespace[section] above. -* This link:https://raw.githubusercontent.com/jenkins-infra/jenkins.io/master/content/doc/tutorials/kubernetes/installing-jenkins-on-kubernetes/jenkins-deployment.yaml[deployment file] is defining a Deployment as indicated by the `kind` field. +* This link:https://raw.githubusercontent.com/jenkins-infra/jenkins.io/main/content/doc/tutorials/kubernetes/installing-jenkins-on-kubernetes/jenkins-deployment.yaml[deployment file] is defining a Deployment as indicated by the `kind` field. * The Deployment specifies a single replica. This ensures one and only one instance will be maintained by the Replication Controller in the event of failure. * The container image name is jenkins and version is 2.32.2 @@ -330,9 +330,9 @@ It allows us to maintain a persistent connection to the pod regardless of the ch With a local deployment, this means creating a NodePort service type. A NodePort service type exposes a service on a port on each node in the cluster. The service is accessed through the Node IP address and the service nodePort. -A simple service is defined link:https://raw.githubusercontent.com/jenkins-infra/jenkins.io/master/content/doc/tutorials/kubernetes/installing-jenkins-on-kubernetes/jenkins-service.yaml[here]: +A simple service is defined link:https://raw.githubusercontent.com/jenkins-infra/jenkins.io/main/content/doc/tutorials/kubernetes/installing-jenkins-on-kubernetes/jenkins-service.yaml[here]: -* This link:https://raw.githubusercontent.com/jenkins-infra/jenkins.io/master/content/doc/tutorials/kubernetes/installing-jenkins-on-kubernetes/jenkins-service.yaml[service file] is defining a Service as +* This link:https://raw.githubusercontent.com/jenkins-infra/jenkins.io/main/content/doc/tutorials/kubernetes/installing-jenkins-on-kubernetes/jenkins-service.yaml[service file] is defining a Service as indicated by the `kind` field. * The Service is of type NodePort. Other options are ClusterIP (only accessible within the cluster) and LoadBalancer (IP address assigned by a cloud provider e.g. AWS Elastic IP). * The list of ports specified within the spec is a list of ports exposed by this service. From 2de8d2d5cf5b5e7ae0602c9363ba4ce6b5e686bd Mon Sep 17 00:00:00 2001 From: Kevin Martens <99040580+kmartens27@users.noreply.github.com> Date: Wed, 12 Feb 2025 15:34:49 -0500 Subject: [PATCH 10/35] Update architecture index for main --- content/doc/developer/architecture/index.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/doc/developer/architecture/index.adoc b/content/doc/developer/architecture/index.adoc index 3fa9e9cbaa2d..13ae68ff4141 100644 --- a/content/doc/developer/architecture/index.adoc +++ b/content/doc/developer/architecture/index.adoc @@ -26,4 +26,4 @@ Please note that: image::/images/developer/architecture/jenkins-dataflow.png[] -The source of this diagram is https://github.com/jenkins-infra/jenkins.io/tree/master/content/images/developer/architecture/jenkins-dataflow.diagrams.net[on github], to be opened with https://app.diagrams.net. \ No newline at end of file +The source of this diagram is https://github.com/jenkins-infra/jenkins.io/tree/main/content/images/developer/architecture/jenkins-dataflow.diagrams.net[on github], to be opened with https://app.diagrams.net. From 072d9371348d36d03b770d222b07a864c7259200 Mon Sep 17 00:00:00 2001 From: Kevin Martens <99040580+kmartens27@users.noreply.github.com> Date: Wed, 12 Feb 2025 15:41:36 -0500 Subject: [PATCH 11/35] Update hacktoberfest.adoc for main This page would need a handful of updates for `main` --- content/events/hacktoberfest.adoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/events/hacktoberfest.adoc b/content/events/hacktoberfest.adoc index 451f27b6e8f0..15446a784a5a 100644 --- a/content/events/hacktoberfest.adoc +++ b/content/events/hacktoberfest.adoc @@ -23,7 +23,7 @@ This year marks the 11th anniversary of Hacktoberfest! We invite everyone to participate and contribute to the Jenkins project, regardless of their background and Jenkins experience. There are many ways to link:/participate/[contribute] to Jenkins during Hacktoberfest. You can participate by working on link:https:/participate/code/[code] or link:/participate/document/[documentation], contributing to link:/doc/developer/internationalization/[localization], or creating new link:/artwork[artwork]. -You can also share your experiences with Jenkins by link:https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc#adding-a-blog-post[creating a new blogpost]. +You can also share your experiences with Jenkins by link:https://github.com/jenkins-infra/jenkins.io/blob/main/CONTRIBUTING.adoc#adding-a-blog-post[creating a new blogpost]. Generally, any four non-spammy pull requests in GitHub would qualify. Please refer to the link:/participate/[Contribute and Participate] page for more information about how to contribute. @@ -71,7 +71,7 @@ who have committed to assist contributors and to provide quick turnaround in pul CSS | Extend and improve Jenkins documentation, help to improve the website's look&feel, create link:/blog/[a new blogpost], a technology-specific solution page or a tutorial. - link:https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc[Contributing guidelines], + link:https://github.com/jenkins-infra/jenkins.io/blob/main/CONTRIBUTING.adoc[Contributing guidelines], link:https://github.com/jenkins-infra/jenkins.io/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22[Good first issues] Additionally, we invite new and experienced Jenkins developers to help improve the link:/doc/developer/[developer documentation]. @@ -111,7 +111,7 @@ a| The plugin site is used to find information about 1800+ plugins available in link:/projects/[subprojects], and plugins. You can also contribute new graphics to plugins. - link:https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc#adding-a-logo[Adding a logo] + link:https://github.com/jenkins-infra/jenkins.io/blob/main/CONTRIBUTING.adoc#adding-a-logo[Adding a logo] | link:/projects/infrastructure/#pick-up-a-task[Jenkins Infrastructure] | Asciidoctor, Docker, Github Actions, Jenkins Pipeline, Kubernetes, Markdown, Packer, Puppet, Python, Shell, YAML From a2e2803da0e2300ba951eb19241e391a0c0c559f Mon Sep 17 00:00:00 2001 From: Kevin Martens <99040580+kmartens27@users.noreply.github.com> Date: Wed, 12 Feb 2025 15:42:00 -0500 Subject: [PATCH 12/35] Update index.html.haml --- content/events/index.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/events/index.html.haml b/content/events/index.html.haml index 5833610fd7cd..703b1f18587f 100644 --- a/content/events/index.html.haml +++ b/content/events/index.html.haml @@ -92,7 +92,7 @@ notitle: true There are no upcoming major events registered in the database. If you see that your event is missing, please submit a change to our website. %p - %a.body{:href => 'https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc#adding-an-event', :target => '_blank', :rel => 'noreferrer noopener'} + %a.body{:href => 'https://github.com/jenkins-infra/jenkins.io/blob/main/CONTRIBUTING.adoc#adding-an-event', :target => '_blank', :rel => 'noreferrer noopener'} > How to add an event to the Jenkins website? .row From 59f0a8932cc9491ac63cfe51e4f5e1530b3ce7a3 Mon Sep 17 00:00:00 2001 From: Kevin Martens <99040580+kmartens27@users.noreply.github.com> Date: Wed, 12 Feb 2025 15:42:27 -0500 Subject: [PATCH 13/35] Update event-kit.adoc --- content/events/hacktoberfest/event-kit.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/events/hacktoberfest/event-kit.adoc b/content/events/hacktoberfest/event-kit.adoc index 05063d0ea890..3b4067a84447 100644 --- a/content/events/hacktoberfest/event-kit.adoc +++ b/content/events/hacktoberfest/event-kit.adoc @@ -44,7 +44,7 @@ Steps: * Schedule a meetup and announce it, preferably as a link:/projects/jam/[Jenkins Area Meetup] * Register the meetup on the Hacktoberfest site (see the link:https://hacktoberfest.com/events/#organizers[Event Kit]) * Add a meetup to link:/events/hacktoberfest[our Hacktoberfest page] and - then add it to the list of events (link:https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc#adding-an-event[guide]). + then add it to the list of events (link:https://github.com/jenkins-infra/jenkins.io/blob/main/CONTRIBUTING.adoc#adding-an-event[guide]). It can be done in a single pull request. ## Sample agenda and resources From 0cfb707338c2bf14cf1beb73b4c68dfcc595fad7 Mon Sep 17 00:00:00 2001 From: Kevin Martens <99040580+kmartens27@users.noreply.github.com> Date: Wed, 12 Feb 2025 15:43:19 -0500 Subject: [PATCH 14/35] Update design.adoc --- content/participate/design.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/participate/design.adoc b/content/participate/design.adoc index 5c039666ea76..e233913a2b60 100644 --- a/content/participate/design.adoc +++ b/content/participate/design.adoc @@ -21,7 +21,7 @@ image:/images/logos/kongfu/256.png[Kong-fu,128] Useful links: -* link:https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc#adding-a-logo[Contributing Guidelines: Adding a logo] +* link:https://github.com/jenkins-infra/jenkins.io/blob/main/CONTRIBUTING.adoc#adding-a-logo[Contributing Guidelines: Adding a logo] === Design From 7f7cbbab5446f828868204794e03340d618385c5 Mon Sep 17 00:00:00 2001 From: Kevin Martens <99040580+kmartens27@users.noreply.github.com> Date: Wed, 12 Feb 2025 15:43:56 -0500 Subject: [PATCH 15/35] Update document.adoc for main --- content/participate/document.adoc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/content/participate/document.adoc b/content/participate/document.adoc index 96762147e0b4..c698e319dddf 100644 --- a/content/participate/document.adoc +++ b/content/participate/document.adoc @@ -29,16 +29,16 @@ For the most of the repositories we try to follow the documentation-as-code appr | Documentation type | Repository | Comments and links | link:/doc/[User documentation] -| link:https://github.com/jenkins-infra/jenkins.io/tree/master/content/doc[jenkins-infra/jenkins.io] -| link:https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc[Contributing guidelines]. +| link:https://github.com/jenkins-infra/jenkins.io/tree/main/content/doc[jenkins-infra/jenkins.io] +| link:https://github.com/jenkins-infra/jenkins.io/blob/main/CONTRIBUTING.adoc[Contributing guidelines]. | link:/doc/developer[Developer documentation] -| link:https://github.com/jenkins-infra/jenkins.io/tree/master/content/doc/developer[jenkins-infra/jenkins.io] -| link:https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc[Contributing guidelines]. +| link:https://github.com/jenkins-infra/jenkins.io/tree/main/content/doc/developer[jenkins-infra/jenkins.io] +| link:https://github.com/jenkins-infra/jenkins.io/blob/main/CONTRIBUTING.adoc[Contributing guidelines]. | link:/solutions/[Solution pages] -| link:https://github.com/jenkins-infra/jenkins.io/tree/master/content/solutions[jenkins-infra/jenkins.io] -| link:https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc#adding-a-solution-page[Contributing guidelines] +| link:https://github.com/jenkins-infra/jenkins.io/tree/main/content/solutions[jenkins-infra/jenkins.io] +| link:https://github.com/jenkins-infra/jenkins.io/blob/main/CONTRIBUTING.adoc#adding-a-solution-page[Contributing guidelines] | link:https://plugins.jenkins.io/[Plugin documentation] | Plugin repositories or Jenkins Wiki @@ -94,7 +94,7 @@ They are encouraged to submit pull requests for those cases. This is **not** a task for new contributors or for those who are not experienced with Jenkins. New contributors and inexperienced Jenkins users should assist with other documentation tasks rather than attempting to migrate documentation from the wiki to www.jenkins.io. -link:https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc#moving-documentation-from-jenkins-wiki[**Moving other documentation from wiki to www.jenkins.io**] +link:https://github.com/jenkins-infra/jenkins.io/blob/main/CONTRIBUTING.adoc#moving-documentation-from-jenkins-wiki[**Moving other documentation from wiki to www.jenkins.io**] video::KB-NPlRvLoY[youtube,width=640,height=360] From 7eff57ca8cab53add47dffeca9f4c54a2d0088be Mon Sep 17 00:00:00 2001 From: Kevin Martens <99040580+kmartens27@users.noreply.github.com> Date: Wed, 12 Feb 2025 15:45:23 -0500 Subject: [PATCH 16/35] Update contributing.adoc for main --- content/project/adopters/contributing.adoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/project/adopters/contributing.adoc b/content/project/adopters/contributing.adoc index 3b6af3faa8e7..baeeb59bcb81 100644 --- a/content/project/adopters/contributing.adoc +++ b/content/project/adopters/contributing.adoc @@ -16,7 +16,7 @@ There are multiple ways to do it: * Your organization's or your personal blog * link:https://community.jenkins.io/c/using-jenkins/showing-off/9[community.jenkins.io] website in the "Using Jenkins" / "Showing Off" category * link:/blog[Jenkins community blog] on jenkins.io - (link:https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc#adding-a-blog-post[HOWTO]) + (link:https://github.com/jenkins-infra/jenkins.io/blob/main/CONTRIBUTING.adoc#adding-a-blog-post[HOWTO]) * link:https://stories.jenkins.io/[stories.jenkins.io] website with Jenkins user stories * Any other blog or professional network @@ -29,7 +29,7 @@ let them know about your story so that it can be promoted through Jenkins commun A new company can be added via a pull request to the Jenkins website. 1. Fork and clone the `https://github.com/jenkins-infra/jenkins.io` repository to a local computer. - You can find the development guidelines link:https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc[here]. + You can find the development guidelines link:https://github.com/jenkins-infra/jenkins.io/blob/main/CONTRIBUTING.adoc[here]. 2. Create a `COMPANY_ID.adoc` file in the `/content/_data/adopters` directory (see the template below). ** Company ID should be a unique identifier, with up to 32 symbols and no spaces. 3. Fill in the template fields @@ -53,4 +53,4 @@ detailsLinkText: "TODO: display name for the details link" If you want to test your patch before submitting it, it is possible to run the website locally. -See the guidelines link:https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc#building[here]. +See the guidelines link:https://github.com/jenkins-infra/jenkins.io/blob/main/CONTRIBUTING.adoc#building[here]. From c4981d5780df9c0d4891ce505c05e22e70dd09ef Mon Sep 17 00:00:00 2001 From: Kevin Martens <99040580+kmartens27@users.noreply.github.com> Date: Wed, 12 Feb 2025 15:46:07 -0500 Subject: [PATCH 17/35] Update index.html.haml for main --- content/project/roadmap/index.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/project/roadmap/index.html.haml b/content/project/roadmap/index.html.haml index 352d61e939be..e8a37f737024 100644 --- a/content/project/roadmap/index.html.haml +++ b/content/project/roadmap/index.html.haml @@ -70,8 +70,8 @@ tags: %a{:href => "https://github.com/jenkinsci/jep/tree/master/jep/14#submitting-roadmap-suggestions"} HOWTO: Suggest a new roadmap item %li - %a{:href => "https://github.com/jenkins-infra/jenkins.io/blob/master/content/_data/roadmap/roadmap.yml"} + %a{:href => "https://github.com/jenkins-infra/jenkins.io/blob/main/content/_data/roadmap/roadmap.yml"} Open data (roadmap.yml) %li - %a{:href => "https://github.com/jenkins-infra/jenkins.io/blob/master/content/_data/roadmap/archive.yml"} + %a{:href => "https://github.com/jenkins-infra/jenkins.io/blob/main/content/_data/roadmap/archive.yml"} Archive (completed and withdrawn roadmap items) From 91f2c26a75a562d2bded19b79de4022a17140256 Mon Sep 17 00:00:00 2001 From: Kevin Martens <99040580+kmartens27@users.noreply.github.com> Date: Wed, 12 Feb 2025 15:47:07 -0500 Subject: [PATCH 18/35] Update contributors.adoc for main --- content/projects/gsoc/contributors.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/projects/gsoc/contributors.adoc b/content/projects/gsoc/contributors.adoc index 46a356163c06..3b342c4a5d37 100644 --- a/content/projects/gsoc/contributors.adoc +++ b/content/projects/gsoc/contributors.adoc @@ -304,7 +304,7 @@ At the end of each coding period, GSoC contributors are expected to: .. Mentors will offer to do presentation dry-runs, if they forget, contributors should ask for it as needed. . Publish a summary of your status and the next steps .. As a blog post published to: -... To the Jenkins website blogs (see link:https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc#adding-a-blog-post[adding a blog post]) +... To the Jenkins website blogs (see link:https://github.com/jenkins-infra/jenkins.io/blob/main/CONTRIBUTING.adoc#adding-a-blog-post[adding a blog post]) ... And announce the blog post on the link:https://community.jenkins.io[Discourse channel]. As a part of the Final evaluation, contributors present the project results at the link:https://www.meetup.com/Jenkins-online-meetup/[Jenkins Online Meetup] From e699885915a0b426cbc46b388187457895421898 Mon Sep 17 00:00:00 2001 From: Kevin Martens <99040580+kmartens27@users.noreply.github.com> Date: Wed, 12 Feb 2025 15:47:59 -0500 Subject: [PATCH 19/35] Update proposing-project-ideas.adoc for main --- content/projects/gsoc/proposing-project-ideas.adoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/projects/gsoc/proposing-project-ideas.adoc b/content/projects/gsoc/proposing-project-ideas.adoc index e1ab77a77194..723e145f9621 100644 --- a/content/projects/gsoc/proposing-project-ideas.adoc +++ b/content/projects/gsoc/proposing-project-ideas.adoc @@ -42,7 +42,7 @@ by sending a pull request with an `.adoc` file for your project idea. .. fork and clone the link:https://github.com/jenkins-infra/jenkins.io[jenkins.io] repository .. create a new `.adoc` file under the appropriate yearly folder in -link:https://github.com/jenkins-infra/jenkins.io/tree/master/content/projects/gsoc[content/projects/gsoc]. +link:https://github.com/jenkins-infra/jenkins.io/tree/main/content/projects/gsoc[content/projects/gsoc]. For more on the `adoc` format see link:https://asciidoctor.org/[asciidoctor.org]. @@ -246,5 +246,5 @@ time on such proposals. Refer to the following files on Github for additional example to format your project idea submission: -* link:https://github.com/jenkins-infra/jenkins.io/blob/master/content/projects/gsoc/2019/project-ideas/artifactory-rest-plugin.adoc[Project idea with link to a Google Doc] -* link:https://github.com/jenkins-infra/jenkins.io/blob/master/content/projects/gsoc/2019/project-ideas/role-strategy-ux.adoc[Project idea with no link to Google Doc] +* link:https://github.com/jenkins-infra/jenkins.io/blob/main/content/projects/gsoc/2019/project-ideas/artifactory-rest-plugin.adoc[Project idea with link to a Google Doc] +* link:https://github.com/jenkins-infra/jenkins.io/blob/main/content/projects/gsoc/2019/project-ideas/role-strategy-ux.adoc[Project idea with no link to Google Doc] From 3a13fbeb733024c2a7ef0698b78c6812f851a000 Mon Sep 17 00:00:00 2001 From: Kevin Martens <99040580+kmartens27@users.noreply.github.com> Date: Wed, 12 Feb 2025 15:50:48 -0500 Subject: [PATCH 20/35] Update index.adoc for main --- content/sigs/docs/gsod/index.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/sigs/docs/gsod/index.adoc b/content/sigs/docs/gsod/index.adoc index 9444d703224a..17817e093b48 100644 --- a/content/sigs/docs/gsod/index.adoc +++ b/content/sigs/docs/gsod/index.adoc @@ -56,7 +56,7 @@ Here are the common tools we use: * Markdown languages: link:https://asciidoctor.org/[AsciiDoc] and link:https://github.github.com/gfm/[GitHub Flavored Markdown] ** For example, this page is written in Asciidoc. - You can find its sources link:https://github.com/jenkins-infra/jenkins.io/blob/master/content/sigs/docs/gsod/index.adoc[here]. + You can find its sources link:https://github.com/jenkins-infra/jenkins.io/blob/main/content/sigs/docs/gsod/index.adoc[here]. * SCM: link:https://git-scm.com/[Git] * Source Code Hosting: link:http://github.com/[github.com] * Text editing: any text editor with AsciiDoc/Markdown support (e.g. link:https://code.visualstudio.com/[Visual Studio Code], link:https://notepad-plus-plus.org/[Notepad++]) or a specialized IDE From 8af2e112f25785eea54f651b8b913df626b28fad Mon Sep 17 00:00:00 2001 From: Kevin Martens <99040580+kmartens27@users.noreply.github.com> Date: Wed, 12 Feb 2025 15:51:03 -0500 Subject: [PATCH 21/35] Update index.adoc for main --- content/sigs/docs/gsod/index.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/sigs/docs/gsod/index.adoc b/content/sigs/docs/gsod/index.adoc index 17817e093b48..c32f126c9ba3 100644 --- a/content/sigs/docs/gsod/index.adoc +++ b/content/sigs/docs/gsod/index.adoc @@ -63,7 +63,7 @@ Here are the common tools we use: Particular components may also require additional tools for documentation development. For example, the jenkins.io website requires Docker for being built and tested locally. -In such cases we document usage of these tools in link:https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc[our contributing guidelines] and help newcomer maintainers if needed. +In such cases we document usage of these tools in link:https://github.com/jenkins-infra/jenkins.io/blob/main/CONTRIBUTING.adoc[our contributing guidelines] and help newcomer maintainers if needed. == Contacts From 46f2667ccb6f5e8cf459e3881da41bfe86831486 Mon Sep 17 00:00:00 2001 From: Kevin Martens <99040580+kmartens27@users.noreply.github.com> Date: Wed, 12 Feb 2025 15:51:48 -0500 Subject: [PATCH 22/35] Update application.md for main --- content/sigs/docs/gsod/2020/application.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/sigs/docs/gsod/2020/application.md b/content/sigs/docs/gsod/2020/application.md index f3cde8281cbe..d12e92543f0e 100644 --- a/content/sigs/docs/gsod/2020/application.md +++ b/content/sigs/docs/gsod/2020/application.md @@ -63,10 +63,10 @@ A portion of the Jenkins documentation has been created by professional technica We previously had several coordinated documentation initiatives, e.g. creation of new documentation for Jenkins Pipeline. We also facilitate documentation contributions and encourage newcomers to participate (https://jenkins.io/participate/#document), regardless of their experience with Jenkins and our tools. We also invest time in contributing guidelines for documentation contributors, -e.g. here are our contributing guidelines for the website: https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc. +e.g. here are our contributing guidelines for the website: https://github.com/jenkins-infra/jenkins.io/blob/main/CONTRIBUTING.adoc. Reviews: jenkins.io and GitHub documentation are managed and reviewed via pull requests. -For example, there are contribution guidelines for jenkins.io: https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc. +For example, there are contribution guidelines for jenkins.io: https://github.com/jenkins-infra/jenkins.io/blob/main/CONTRIBUTING.adoc. In the project, we also have a team of copy-editors who review the content: https://github.com/orgs/jenkins-infra/teams/copy-editors. Contributions to Jenkins component documentation (e.g. plugin docs) are usually reviewed by maintainers. @@ -88,7 +88,7 @@ The Jenkins project has also been selected for Google Summer of Code 2020. The project also has many contributors whose roles at work include mentoring people (university professors and advisors, training leads, developer relations, senior engineers and tech writers). As an organization, we do not have particular experience in mentoring technical writers, but we do have experience in onboarding documentation contributors to the community. -We also work on onboarding programs for documentation contributors, e.g. for website copy-editors: https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc#maintainer-guide. +We also work on onboarding programs for documentation contributors, e.g. for website copy-editors: https://github.com/jenkins-infra/jenkins.io/blob/main/CONTRIBUTING.adoc#maintainer-guide. ### How many technical writers does your organization want to mentor this year? From ab8845717f296eb0a55e92aa8e0379ade818825e Mon Sep 17 00:00:00 2001 From: Kevin Martens <99040580+kmartens27@users.noreply.github.com> Date: Wed, 12 Feb 2025 15:52:22 -0500 Subject: [PATCH 23/35] Update python.adoc for main --- content/solutions/python.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/solutions/python.adoc b/content/solutions/python.adoc index cf8ec846721e..44bcede4b1d9 100644 --- a/content/solutions/python.adoc +++ b/content/solutions/python.adoc @@ -28,7 +28,7 @@ image::/images/solution-images/jenkins-chart-pylint.png[role=center] == Resources Below are a collection of miscellaneous resources for working with Python on -top of Jenkins. If you believe something is missing, please click ("link:https://github.com/jenkins-infra/jenkins.io/edit/master/content//solutions/python.adoc[here]") or the "Improve this Page" link in the lower right, and submit a pull request! +top of Jenkins. If you believe something is missing, please click ("link:https://github.com/jenkins-infra/jenkins.io/edit/main/content//solutions/python.adoc[here]") or the "Improve this Page" link in the lower right, and submit a pull request! === Templates From 4b360c5fe28f2479e2a39366419127bf019ae746 Mon Sep 17 00:00:00 2001 From: Kevin Martens <99040580+kmartens27@users.noreply.github.com> Date: Wed, 12 Feb 2025 15:53:23 -0500 Subject: [PATCH 24/35] Update values.github-action.yaml for main This is necessary to update as well for main, if the branch name is changed. --- updatecli/values.github-action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/updatecli/values.github-action.yaml b/updatecli/values.github-action.yaml index 73212acc211c..ab1a86de42c4 100644 --- a/updatecli/values.github-action.yaml +++ b/updatecli/values.github-action.yaml @@ -3,6 +3,6 @@ github: email: "41898282+github-actions[bot]@users.noreply.github.com" username: "github-actions" token: "UPDATECLI_GITHUB_TOKEN" - branch: "master" + branch: "main" owner: "jenkins-infra" repository: "jenkins.io" From b1b7c8b28cfdc1ca0a2246672d886892e4833402 Mon Sep 17 00:00:00 2001 From: Birajit Saikia Date: Mon, 24 Feb 2025 22:56:07 +0530 Subject: [PATCH 25/35] update jenkins.io/tree/master and jenkins.io/blob/master into main --- content/blog/2017/08/2017-08-23-pull-requests-and-more.adoc | 2 +- content/blog/2017/10/2017-10-06-hacktoberfest.adoc | 4 ++-- content/blog/2018/03/2018-03-12-browser-usage.adoc | 2 +- content/blog/2018/10/2018-10-01-hacktoberfest.adoc | 4 ++-- .../blog/2019/03/2019-03-29-becoming-contributor-intro.adoc | 4 ++-- content/blog/2019/05/2019-05-11-docs-sig-announcement.adoc | 2 +- content/blog/2019/10/2019-10-21-plugin-docs-on-github.adoc | 2 +- content/blog/2019/12/2019-12-20-call-for-mentors.adoc | 2 +- content/blog/2020/06/2020-06-08-hackfest-docs-results.adoc | 2 +- content/blog/2020/12/2020-12-16-call-for-mentors.adoc | 2 +- content/blog/2022/01/2022-01-07-gsoc-2022.adoc | 2 +- content/blog/2022/11/2022-11-16-gsoc-2023.adoc | 2 +- .../2023-12-05-google-summer-of-code-a-call-for-mentors.adoc | 2 +- ...lunteers-needed-to-mentor-future-jenkins-contributors.adoc | 2 +- 14 files changed, 17 insertions(+), 17 deletions(-) diff --git a/content/blog/2017/08/2017-08-23-pull-requests-and-more.adoc b/content/blog/2017/08/2017-08-23-pull-requests-and-more.adoc index 1c6a10bc8b1c..4edbe4b2daf6 100644 --- a/content/blog/2017/08/2017-08-23-pull-requests-and-more.adoc +++ b/content/blog/2017/08/2017-08-23-pull-requests-and-more.adoc @@ -80,7 +80,7 @@ user documentation (link:/doc/[guided tour] and link:/doc/book/[handbook]) and developer documentation (link:/doc/developer/[tutorial], link:/doc/developer/guides/[how-to guides], and link:/doc/developer/book/[reference]). You can help the documentation by describing something important to you clearly and completely. -Refer to the link:https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc#adding-documentation[instructions for documentation contributors] to see how easy it is to help. +Refer to the link:https://github.com/jenkins-infra/jenkins.io/blob/main/CONTRIBUTING.adoc#adding-documentation[instructions for documentation contributors] to see how easy it is to help. === Forty Five Minutes for Translation diff --git a/content/blog/2017/10/2017-10-06-hacktoberfest.adoc b/content/blog/2017/10/2017-10-06-hacktoberfest.adoc index 78ddb33c91fd..dc90408b0424 100644 --- a/content/blog/2017/10/2017-10-06-hacktoberfest.adoc +++ b/content/blog/2017/10/2017-10-06-hacktoberfest.adoc @@ -28,7 +28,7 @@ You can... * Write code * Improve documentation, -write link:https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc#adding-a-blog-post[blogposts] +write link:https://github.com/jenkins-infra/jenkins.io/blob/main/CONTRIBUTING.adoc#adding-a-blog-post[blogposts] * Automate Tests * Translate and link:https://wiki.jenkins.io/display/JENKINS/Internationalization[internationalize] components * Design - artwork and UI improvements also count! @@ -47,7 +47,7 @@ For example, you could contribute to the following components: * link:https://github.com/jenkinsci/jenkins[Jenkins Core] (link:https://github.com/jenkinsci/jenkins/blob/master/CONTRIBUTING.md[contributing]) * link:https://github.com/jenkins-infra/jenkins.io/[Project Website] -(link:https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc[contributing]) +(link:https://github.com/jenkins-infra/jenkins.io/blob/main/CONTRIBUTING.adoc[contributing]) * Packaging ( link:https://github.com/jenkinsci/docker[Docker], link:https://github.com/jenkinsci/packaging[native packages] diff --git a/content/blog/2018/03/2018-03-12-browser-usage.adoc b/content/blog/2018/03/2018-03-12-browser-usage.adoc index c0be1eb636df..414d66480aca 100644 --- a/content/blog/2018/03/2018-03-12-browser-usage.adoc +++ b/content/blog/2018/03/2018-03-12-browser-usage.adoc @@ -137,4 +137,4 @@ Jenkins.io visitors are a majority of desktop users. They are aligned with the world trends when we talk about desktop browsers however only a minority of them come from a mobile. This is probably because jenkins.io is not (yet) mobile friendly and obsiously this would be a nice improvement to have. -All https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc[contributions] are welcomed and especially for mobile user experience. +All https://github.com/jenkins-infra/jenkins.io/blob/main/CONTRIBUTING.adoc[contributions] are welcomed and especially for mobile user experience. diff --git a/content/blog/2018/10/2018-10-01-hacktoberfest.adoc b/content/blog/2018/10/2018-10-01-hacktoberfest.adoc index 38ab5127218b..5647c3ae6754 100644 --- a/content/blog/2018/10/2018-10-01-hacktoberfest.adoc +++ b/content/blog/2018/10/2018-10-01-hacktoberfest.adoc @@ -37,7 +37,7 @@ You can... mostly Java, Groovy, and JavaScript + Go in Jenkins ** You can also find components in Ruby/Kotlin, and even native components in C/C++ * **Document** - Improve documentation -* **Blog** - write link:https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc#adding-a-blog-post[blogposts] about Jenkins +* **Blog** - write link:https://github.com/jenkins-infra/jenkins.io/blob/main/CONTRIBUTING.adoc#adding-a-blog-post[blogposts] about Jenkins * **Localize** - link:https://wiki.jenkins.io/display/JENKINS/Internationalization[Localize] Jenkins components * **Design** - link:/artwork[artwork] and UI improvements also count! * **Organize** - Organize a local meetup for Jenkins & Hacktoberfest (see below) @@ -66,7 +66,7 @@ Here is a list of Jenkins subprojects with maintainers who have committed to del | link:/[Jenkins Website] | Extend and improve Jenkins documentation, add your own blogpost. - link:https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc[Contributing guidelines] + link:https://github.com/jenkins-infra/jenkins.io/blob/main/CONTRIBUTING.adoc[Contributing guidelines] | link:https://jenkins-x.io/[Jenkins X] | Try out the project and create new demos, diff --git a/content/blog/2019/03/2019-03-29-becoming-contributor-intro.adoc b/content/blog/2019/03/2019-03-29-becoming-contributor-intro.adoc index 9d18b947d8b0..43fbe8564276 100644 --- a/content/blog/2019/03/2019-03-29-becoming-contributor-intro.adoc +++ b/content/blog/2019/03/2019-03-29-becoming-contributor-intro.adoc @@ -84,7 +84,7 @@ ahead with it. === The website repository In the ”Document” section there is a link to the -https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc[contributing guidelines of the jenkins.io repository]. +https://github.com/jenkins-infra/jenkins.io/blob/main/CONTRIBUTING.adoc[contributing guidelines of the jenkins.io repository]. The CONTRIBUTING file is a common file present in the root folder of most open-source-project repositories. Following the link to that file, I reached the jenkins.io repository, which is the one that contains the sources for @@ -139,7 +139,7 @@ image::/images/post-images/2019-03-29-becoming-contributor/creating-pr.png[] When a PR to this repository is created, we notice there are some checks that start running. Jenkins repositories are configured to notify the https://ci.jenkins.io/[“Jenkins on Jenkins”], which runs the corresponding CI pipelines for -each repository, as described in the corresponding https://github.com/jenkins-infra/jenkins.io/blob/master/Jenkinsfile[Jenkinsfile]. +each repository, as described in the corresponding https://github.com/jenkins-infra/jenkins.io/blob/main/Jenkinsfile[Jenkinsfile]. Once the checks are completed, we can see the result in the PR: diff --git a/content/blog/2019/05/2019-05-11-docs-sig-announcement.adoc b/content/blog/2019/05/2019-05-11-docs-sig-announcement.adoc index 95587f6a13b7..8edd66538367 100644 --- a/content/blog/2019/05/2019-05-11-docs-sig-announcement.adoc +++ b/content/blog/2019/05/2019-05-11-docs-sig-announcement.adoc @@ -26,7 +26,7 @@ The Jenkins Documentation SIG would love to have your help with: == How can I fix a documentation bug? -Instructions for contributing to the Jenkins documentation are in the link:https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc#getting-started[CONTRIBUTING file] of the site repository. +Instructions for contributing to the Jenkins documentation are in the link:https://github.com/jenkins-infra/jenkins.io/blob/main/CONTRIBUTING.adoc#getting-started[CONTRIBUTING file] of the site repository. Follow the instructions in that file and submit pull requests for review. Instructions for contributing to the Jenkins X documentation are on the link:https://jenkins-x.io/community/documentation/[Jenkins X documentation site]. diff --git a/content/blog/2019/10/2019-10-21-plugin-docs-on-github.adoc b/content/blog/2019/10/2019-10-21-plugin-docs-on-github.adoc index c3cda5ba2cdc..0338514848b8 100644 --- a/content/blog/2019/10/2019-10-21-plugin-docs-on-github.adoc +++ b/content/blog/2019/10/2019-10-21-plugin-docs-on-github.adoc @@ -94,7 +94,7 @@ and you are welcome to submit pull requests against any repository. Migrating documentation: * link:/doc/developer/publishing/wiki-page/#migrating-from-wiki-to-github[Migrating plugin documentation from Wiki to GitHub] -* link:https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc#moving-documentation-from-jenkins-wiki[Moving documentation from Jenkins Wiki to jenkins.io] +* link:https://github.com/jenkins-infra/jenkins.io/blob/main/CONTRIBUTING.adoc#moving-documentation-from-jenkins-wiki[Moving documentation from Jenkins Wiki to jenkins.io] * jira:JENKINS-59467[Template issue for plugin docs migration] * link:https://issues.jenkins.io/issues/?filter=18650&jql=project%20%3D%20WEBSITE%20AND%20labels%20%3D%20newbie-friendly%20and%20status%20in%20(Open%2C%20Reopened%2C%20%22To%20Do%22)[Newbie-friendly documentation tasks] diff --git a/content/blog/2019/12/2019-12-20-call-for-mentors.adoc b/content/blog/2019/12/2019-12-20-call-for-mentors.adoc index e01a7742fbe7..c182b950e604 100644 --- a/content/blog/2019/12/2019-12-20-call-for-mentors.adoc +++ b/content/blog/2019/12/2019-12-20-call-for-mentors.adoc @@ -36,7 +36,7 @@ So send us your project ideas before the beginning of February so they can get a For 2020, we have simplified the process. Simply create a pull-request with your idea in a `.adoc` file -in the link:https://github.com/jenkins-infra/jenkins.io/tree/master/content/projects/gsoc/2020/project-ideas[idea folder]. +in the link:https://github.com/jenkins-infra/jenkins.io/tree/main/content/projects/gsoc/2020/project-ideas[idea folder]. It is no longer necessary to submit a Google Doc, but it will still work if you want to do that. See the link:/projects/gsoc/proposing-project-ideas[instructions] on submitting ideas which include an `.adoc` template and some examples. diff --git a/content/blog/2020/06/2020-06-08-hackfest-docs-results.adoc b/content/blog/2020/06/2020-06-08-hackfest-docs-results.adoc index 0f61dad1be27..892fcd335353 100644 --- a/content/blog/2020/06/2020-06-08-hackfest-docs-results.adoc +++ b/content/blog/2020/06/2020-06-08-hackfest-docs-results.adoc @@ -105,7 +105,7 @@ image:/images/post-images/2020-06-08-docs-from-hackfest/plugins-site.png[Plugins There is still much to do in Jenkins documentation and we need your help to do it. There are many ways to link:/participate/[participate] in the Jenkins project, including link:/participate/document[documentation]. -See the link:https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc[contributing guidelines] for detailed instructions. +See the link:https://github.com/jenkins-infra/jenkins.io/blob/main/CONTRIBUTING.adoc[contributing guidelines] for detailed instructions. Join the https://app.gitter.im/#/room/#jenkins/docs:matrix.org[documentation chat] for personalized help and encouragement. The Jenkins project has been also accepted to link:https://developers.google.com/season-of-docs[Google Season of Docs] this year. diff --git a/content/blog/2020/12/2020-12-16-call-for-mentors.adoc b/content/blog/2020/12/2020-12-16-call-for-mentors.adoc index 1e90a8916d67..7fb0cb14e24d 100644 --- a/content/blog/2020/12/2020-12-16-call-for-mentors.adoc +++ b/content/blog/2020/12/2020-12-16-call-for-mentors.adoc @@ -36,7 +36,7 @@ Please send us your project ideas before the beginning of February so they can g === How to submit a project idea Create a pull-request with your idea in a `.adoc` file -in the link:https://github.com/jenkins-infra/jenkins.io/tree/master/content/projects/gsoc/2021/project-ideas[project ideas]. +in the link:https://github.com/jenkins-infra/jenkins.io/tree/main/content/projects/gsoc/2021/project-ideas[project ideas]. It is not necessary to submit a Google Doc, but it will still work if you want to do that. See the link:/projects/gsoc/proposing-project-ideas[instructions] on submitting ideas which include an `.adoc` template and some examples. diff --git a/content/blog/2022/01/2022-01-07-gsoc-2022.adoc b/content/blog/2022/01/2022-01-07-gsoc-2022.adoc index 43fc056a7b19..e6c7aa20efe8 100644 --- a/content/blog/2022/01/2022-01-07-gsoc-2022.adoc +++ b/content/blog/2022/01/2022-01-07-gsoc-2022.adoc @@ -34,7 +34,7 @@ Anyone can submit a project idea, but of course we like it even better if you me Please send us your project ideas before the beginning of February so they can get a proper review by the GSoC committee and by the community. === How to submit a project idea -Create a pull-request with your idea in a .adoc file in the link:https://github.com/jenkins-infra/jenkins.io/tree/master/content/projects/gsoc/2022/project-ideas[project ideas]. +Create a pull-request with your idea in a .adoc file in the link:https://github.com/jenkins-infra/jenkins.io/tree/main/content/projects/gsoc/2022/project-ideas[project ideas]. It is not necessary to submit a Google Doc, but it will still work if you want to do that. See the link:/projects/gsoc/proposing-project-ideas/[instructions] on submitting ideas which include an .adoc template and some examples. diff --git a/content/blog/2022/11/2022-11-16-gsoc-2023.adoc b/content/blog/2022/11/2022-11-16-gsoc-2023.adoc index 484bc06815c3..3b96aad43fbe 100644 --- a/content/blog/2022/11/2022-11-16-gsoc-2023.adoc +++ b/content/blog/2022/11/2022-11-16-gsoc-2023.adoc @@ -36,7 +36,7 @@ Anyone can submit a project idea, but of course we like it even better if you me Please send us your project ideas before the beginning of February so they can get a proper review by the GSoC committee and by the community. === How to submit a project idea -Create a pull-request with your idea in a .adoc file in the link:https://github.com/jenkins-infra/jenkins.io/tree/master/content/projects/gsoc/2023/project-ideas[project ideas]. +Create a pull-request with your idea in a .adoc file in the link:https://github.com/jenkins-infra/jenkins.io/tree/main/content/projects/gsoc/2023/project-ideas[project ideas]. It is not necessary to submit a Google Doc, but it will still work if you want to do that. See the link:/projects/gsoc/proposing-project-ideas/[instructions] on submitting ideas which include an .adoc template and some examples. diff --git a/content/blog/2023/12/2023-12-05-google-summer-of-code-a-call-for-mentors.adoc b/content/blog/2023/12/2023-12-05-google-summer-of-code-a-call-for-mentors.adoc index 70da5503b719..bcee9b2e67d1 100644 --- a/content/blog/2023/12/2023-12-05-google-summer-of-code-a-call-for-mentors.adoc +++ b/content/blog/2023/12/2023-12-05-google-summer-of-code-a-call-for-mentors.adoc @@ -60,7 +60,7 @@ Of course, we would love it if you were the mentor for your project idea. == How to submit a project idea -Create a pull request with your idea in a .adoc file in the link:https://github.com/jenkins-infra/jenkins.io/tree/master/content/projects/gsoc/2023/project-ideas[project ideas]. +Create a pull request with your idea in a .adoc file in the link:https://github.com/jenkins-infra/jenkins.io/tree/main/content/projects/gsoc/2023/project-ideas[project ideas]. It is not necessary to submit a Google Doc, but it will still work if you want to do that. Refer to the link:https://www.jenkins.io/projects/gsoc/proposing-project-ideas/[instructions] on submitting ideas which include an .adoc template and some examples. diff --git a/content/blog/2024/12/16/2024-12-16-google-summer-of-code-2025-volunteers-needed-to-mentor-future-jenkins-contributors.adoc b/content/blog/2024/12/16/2024-12-16-google-summer-of-code-2025-volunteers-needed-to-mentor-future-jenkins-contributors.adoc index 15b73582a430..5bb225a70e32 100644 --- a/content/blog/2024/12/16/2024-12-16-google-summer-of-code-2025-volunteers-needed-to-mentor-future-jenkins-contributors.adoc +++ b/content/blog/2024/12/16/2024-12-16-google-summer-of-code-2025-volunteers-needed-to-mentor-future-jenkins-contributors.adoc @@ -61,7 +61,7 @@ Of course, we would love it if you were the mentor for your project idea. == How to submit a project idea -Create a pull request with your idea in an .adoc file in the link:https://github.com/jenkins-infra/jenkins.io/tree/master/content/projects/gsoc/2025/project-ideas[project ideas]. +Create a pull request with your idea in an .adoc file in the link:https://github.com/jenkins-infra/jenkins.io/tree/main/content/projects/gsoc/2025/project-ideas[project ideas]. It is not necessary to submit a Google Doc, but it will still work if you want to do that. Refer to the link:https://www.jenkins.io/projects/gsoc/proposing-project-ideas/[instructions] on submitting ideas, which include an .adoc template and some examples. From 1d9872769006ddf5072495a6eeac4961cb82f806 Mon Sep 17 00:00:00 2001 From: Birajit Saikia Date: Fri, 28 Mar 2025 22:23:02 +0530 Subject: [PATCH 26/35] Update index.html.haml --- content/artwork/index.html.haml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/content/artwork/index.html.haml b/content/artwork/index.html.haml index 98e6ac69f3e2..5753dafae371 100644 --- a/content/artwork/index.html.haml +++ b/content/artwork/index.html.haml @@ -141,14 +141,13 @@ tight: true %hr/ -.container - .row - .col-md-12 - %h3 - Adding a Logo - %p - In order to add a new logo, please refer to the - %a{:href => 'https://github.com/jenkins-infra/jenkins.io/blob/main/CONTRIBUTING.adoc#adding-a-logo'} - CONTRIBUTING guidelines. +.row + .col-md-12 + %h3 + Adding a Logo + %p + In order to add a new logo, please refer to the + %a{:href => 'https://github.com/jenkins-infra/jenkins.io/blob/main/CONTRIBUTING.adoc#adding-a-logo'} + CONTRIBUTING guidelines. = partial('anchors.html.haml', :selector => '.artwork-container'); From 18c1beec2d2e8b0152da7f5a6067d799f4f51cfa Mon Sep 17 00:00:00 2001 From: Birajit Saikia Date: Fri, 28 Mar 2025 22:27:34 +0530 Subject: [PATCH 27/35] Update _kubernetes.adoc --- content/doc/book/installing/_kubernetes.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/doc/book/installing/_kubernetes.adoc b/content/doc/book/installing/_kubernetes.adoc index 88d7200557b3..052678756976 100644 --- a/content/doc/book/installing/_kubernetes.adoc +++ b/content/doc/book/installing/_kubernetes.adoc @@ -43,7 +43,7 @@ We choose to use the `/data` directory. This directory will contain our Jenkins *We will create a volume which is called jenkins-pv:* -. Paste the content from link:https://raw.githubusercontent.com/jenkins-infra/jenkins.io/main/content/doc/tutorials/kubernetes/installing-jenkins-on-kubernetes/jenkins-volume.yaml[https://raw.githubusercontent.com/installing-jenkins-on-kubernetes/jenkins-volume.yaml] into a YAML formatted file called `jenkins-volume.yaml`. +. Paste the content from link:https://raw.githubusercontent.com/jenkins-infra/jenkins.io/main/content/doc/tutorials/kubernetes/installing-jenkins-on-kubernetes/jenkinsHelm-01-volume.yaml[https://raw.githubusercontent.com/installing-jenkins-on-kubernetes/jenkinsHelm-01-volume.yaml] into a YAML formatted file called `jenkinsHelm-01-volume.yaml`. . Run the following command to apply the spec: + [source,bash] From 35d66020e6b6ec4db03744dc00b0ac7008742ab7 Mon Sep 17 00:00:00 2001 From: Birajit Saikia Date: Fri, 28 Mar 2025 22:57:24 +0530 Subject: [PATCH 28/35] Update _kubernetes.adoc --- content/doc/book/installing/_kubernetes.adoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/doc/book/installing/_kubernetes.adoc b/content/doc/book/installing/_kubernetes.adoc index 052678756976..9cf754478dc4 100644 --- a/content/doc/book/installing/_kubernetes.adoc +++ b/content/doc/book/installing/_kubernetes.adoc @@ -282,9 +282,9 @@ The YAML files are easily tracked, edited, and can be reused indefinitely. === Create Jenkins deployment file -Copy the contents link:https://raw.githubusercontent.com/jenkins-infra/jenkins.io/main/content/doc/tutorials/kubernetes/installing-jenkins-on-kubernetes/jenkins-deployment.yaml[here] into your preferred text editor and create a jenkins-deployment.yaml file in the “jenkins” namespace we created in this link:/doc/book/installing/kubernetes/#create-a-namespace[section] above. +Copy the contents link:https://raw.githubusercontent.com/jenkins-infra/jenkins.io/main/content/doc/tutorials/kubernetes/installing-jenkins-on-kubernetes/jenkinsHelm-03-deployment.yaml[here] into your preferred text editor and create a jenkinsHelm-03-deployment.yaml file in the “jenkins” namespace we created in this link:/doc/book/installing/kubernetes/#create-a-namespace[section] above. -* This link:https://raw.githubusercontent.com/jenkins-infra/jenkins.io/main/content/doc/tutorials/kubernetes/installing-jenkins-on-kubernetes/jenkins-deployment.yaml[deployment file] is defining a Deployment as indicated by the `kind` field. +* This link:https://raw.githubusercontent.com/jenkins-infra/jenkins.io/main/content/doc/tutorials/kubernetes/installing-jenkins-on-kubernetes/jenkinsHelm-03-deployment.yaml[deployment file] is defining a Deployment as indicated by the `kind` field. * The Deployment specifies a single replica. This ensures one and only one instance will be maintained by the Replication Controller in the event of failure. * The container image name is `jenkins` and version is a floating tag `lts-jdk21` @@ -334,7 +334,7 @@ It allows us to maintain a persistent connection to the pod regardless of the ch With a local deployment, this means creating a NodePort service type. A NodePort service type exposes a service on a port on each node in the cluster. The service is accessed through the Node IP address and the service nodePort. -A simple service is defined link:https://raw.githubusercontent.com/jenkins-infra/jenkins.io/main/content/doc/tutorials/kubernetes/installing-jenkins-on-kubernetes/jenkins-service.yaml[here]: +A simple service is defined link:https://raw.githubusercontent.com/jenkins-infra/jenkins.io/main/content/doc/tutorials/kubernetes/installing-jenkins-on-kubernetes/jenkinsHelm-04-service.yaml[here]: * This link:https://raw.githubusercontent.com/jenkins-infra/jenkins.io/main/content/doc/tutorials/kubernetes/installing-jenkins-on-kubernetes/jenkins-service.yaml[service file] is defining a Service as indicated by the `kind` field. From 197a9d394bdb108b0c7efb422680b7acf9efdcdd Mon Sep 17 00:00:00 2001 From: Birajit Saikia Date: Sun, 30 Mar 2025 05:54:19 +0530 Subject: [PATCH 29/35] Update _kubernetes.adoc --- content/doc/book/installing/_kubernetes.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/doc/book/installing/_kubernetes.adoc b/content/doc/book/installing/_kubernetes.adoc index 9cf754478dc4..1907088f1d3e 100644 --- a/content/doc/book/installing/_kubernetes.adoc +++ b/content/doc/book/installing/_kubernetes.adoc @@ -96,8 +96,8 @@ A RoleBinding may reference any Role in the same namespace. Alternatively, a RoleBinding can reference a ClusterRole and bind that ClusterRole to the namespace of the RoleBinding. To bind a ClusterRole to all the namespaces in our cluster, we use a ClusterRoleBinding. -. Paste the content from link:https://raw.githubusercontent.com/jenkins-infra/jenkins.io/main/content/doc/tutorials/kubernetes/installing-jenkins-on-kubernetes/jenkins-sa.yaml[https://raw.githubusercontent.com/installing-jenkins-on-kubernetes/jenkins-sa.yaml] into a YAML formatted file called -`jenkins-sa.yaml`. +. Paste the content from link:https://raw.githubusercontent.com/jenkins-infra/jenkins.io/main/content/doc/tutorials/kubernetes/installing-jenkins-on-kubernetes/jenkinsHelm-02-sa.yaml[https://raw.githubusercontent.com/installing-jenkins-on-kubernetes/jenkinsHelm-02-sa.yaml] into a YAML formatted file called +`jenkinsHelm-02-sa.yaml`. + . Run the following command to apply the spec: + From 0c72329c2edca237a7d4fb4f98a894eb87077acd Mon Sep 17 00:00:00 2001 From: Birajit Saikia Date: Sun, 30 Mar 2025 05:55:33 +0530 Subject: [PATCH 30/35] Update _kubernetes.adoc --- content/doc/book/installing/_kubernetes.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/doc/book/installing/_kubernetes.adoc b/content/doc/book/installing/_kubernetes.adoc index 1907088f1d3e..a8d1bf979cb8 100644 --- a/content/doc/book/installing/_kubernetes.adoc +++ b/content/doc/book/installing/_kubernetes.adoc @@ -336,7 +336,7 @@ A NodePort service type exposes a service on a port on each node in the cluster. The service is accessed through the Node IP address and the service nodePort. A simple service is defined link:https://raw.githubusercontent.com/jenkins-infra/jenkins.io/main/content/doc/tutorials/kubernetes/installing-jenkins-on-kubernetes/jenkinsHelm-04-service.yaml[here]: -* This link:https://raw.githubusercontent.com/jenkins-infra/jenkins.io/main/content/doc/tutorials/kubernetes/installing-jenkins-on-kubernetes/jenkins-service.yaml[service file] is defining a Service as +* This link:https://raw.githubusercontent.com/jenkins-infra/jenkins.io/main/content/doc/tutorials/kubernetes/installing-jenkins-on-kubernetes/jenkinsHelm-04-service.yaml[service file] is defining a Service as indicated by the `kind` field. * The Service is of type NodePort. Other options are ClusterIP (only accessible within the cluster) and LoadBalancer (IP address assigned by a cloud provider e.g. AWS Elastic IP). * The list of ports specified within the spec is a list of ports exposed by this service. From e706169ece16b11292e8fd80dc995eb230aa0e85 Mon Sep 17 00:00:00 2001 From: Birajit Saikia Date: Thu, 3 Apr 2025 19:31:31 +0530 Subject: [PATCH 31/35] resolved --- .github/workflows/updatecli.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/updatecli.yaml b/.github/workflows/updatecli.yaml index 2c73cf9e769d..1643a8c7403b 100644 --- a/.github/workflows/updatecli.yaml +++ b/.github/workflows/updatecli.yaml @@ -24,7 +24,7 @@ jobs: UPDATECLI_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Run Updatecli in Apply mode - if: github.ref == 'refs/heads/main' + if: github.ref == 'refs/heads/master' run: updatecli apply --config ./updatecli/updatecli.d --values ./updatecli/values.github-action.yaml env: UPDATECLI_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 5dc71a763e8bf9511ecd5531d9f48ce854396e5f Mon Sep 17 00:00:00 2001 From: Birajit Saikia Date: Thu, 3 Apr 2025 20:01:50 +0530 Subject: [PATCH 32/35] new changes --- .github/workflows/compress-images.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/compress-images.yaml b/.github/workflows/compress-images.yaml index b1a560bf027c..fdb3321b204c 100644 --- a/.github/workflows/compress-images.yaml +++ b/.github/workflows/compress-images.yaml @@ -1,6 +1,6 @@ # Image Actions will run in the following scenarios: # - on Pull Requests containing images (not including forks) -# - on pushing of images to `main` (for forks) +# - on pushing of images to `master` (for forks) # - on demand (https://github.blog/changelog/2020-07-06-github-actions-manual-triggers-with-workflow_dispatch/) # - at 11 PM every Sunday in anything gets missed with any of the above scenarios # For Pull Requests, the images are added to the PR. @@ -15,7 +15,7 @@ on: - '**.webp' push: branches: - - main + - master paths: - '**.jpg' - '**.jpeg' From b5d8d68fb1f0eed13fbc11a2763daeceeda0d0f4 Mon Sep 17 00:00:00 2001 From: Birajit Saikia Date: Thu, 3 Apr 2025 21:42:27 +0530 Subject: [PATCH 33/35] fixing --- .github/ISSUE_TEMPLATE/1-documentation.yml | 2 +- .github/ISSUE_TEMPLATE/2-wiki-migration.yml | 2 +- .github/ISSUE_TEMPLATE/3-enhancement.yml | 2 +- .github/ISSUE_TEMPLATE/4-bug.yml | 2 +- .github/dependabot.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/1-documentation.yml b/.github/ISSUE_TEMPLATE/1-documentation.yml index 57d505de0125..df2c5282e355 100644 --- a/.github/ISSUE_TEMPLATE/1-documentation.yml +++ b/.github/ISSUE_TEMPLATE/1-documentation.yml @@ -18,4 +18,4 @@ body: - type: textarea attributes: label: Are you interested in contributing a fix? - description: Indicate if this is something you would like to work on, and how we can best support you in doing so. More details [on contributing](https://github.com/jenkins-infra/jenkins.io/blob/main/CONTRIBUTING.adoc) + description: Indicate if this is something you would like to work on, and how we can best support you in doing so. More details [on contributing](https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc) diff --git a/.github/ISSUE_TEMPLATE/2-wiki-migration.yml b/.github/ISSUE_TEMPLATE/2-wiki-migration.yml index c187cd4f6fd0..18174d66f8f4 100644 --- a/.github/ISSUE_TEMPLATE/2-wiki-migration.yml +++ b/.github/ISSUE_TEMPLATE/2-wiki-migration.yml @@ -24,4 +24,4 @@ body: id: info attributes: value: | - For contributors: [Wiki Migration Guidelines](https://github.com/jenkins-infra/jenkins.io/blob/main/CONTRIBUTING.adoc#moving-documentation-from-jenkins-wiki) + For contributors: [Wiki Migration Guidelines](https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc#moving-documentation-from-jenkins-wiki) diff --git a/.github/ISSUE_TEMPLATE/3-enhancement.yml b/.github/ISSUE_TEMPLATE/3-enhancement.yml index 7cfaba3d670c..a268fd24ec36 100644 --- a/.github/ISSUE_TEMPLATE/3-enhancement.yml +++ b/.github/ISSUE_TEMPLATE/3-enhancement.yml @@ -22,4 +22,4 @@ body: - type: textarea attributes: label: Are you interested in contributing to this improvement? - description: Indicate if this is something you would like to work on, and how we can best support you in doing so. More details [on contributing](https://github.com/jenkins-infra/jenkins.io/blob/main/CONTRIBUTING.adoc) + description: Indicate if this is something you would like to work on, and how we can best support you in doing so. More details [on contributing](https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc) diff --git a/.github/ISSUE_TEMPLATE/4-bug.yml b/.github/ISSUE_TEMPLATE/4-bug.yml index 2281f62b04f2..20dd603241cf 100644 --- a/.github/ISSUE_TEMPLATE/4-bug.yml +++ b/.github/ISSUE_TEMPLATE/4-bug.yml @@ -34,4 +34,4 @@ body: - type: textarea attributes: label: Are you interested in contributing a fix? - description: Indicate if this is something you would like to work on, and how we can best support you in doing so. More details [on contributing](https://github.com/jenkins-infra/jenkins.io/blob/main/CONTRIBUTING.adoc) + description: Indicate if this is something you would like to work on, and how we can best support you in doing so. More details [on contributing](https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index b5be0219514b..668d0c5aae35 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,7 +4,7 @@ updates: # GitHub actions - package-ecosystem: "github-actions" - target-branch: main + target-branch: master directory: "/" schedule: # Check for updates to GitHub Actions every week From 8bb23fcc4ae2e78a141626b7f0cddf20b5375c7a Mon Sep 17 00:00:00 2001 From: Birajit Saikia Date: Thu, 3 Apr 2025 21:57:25 +0530 Subject: [PATCH 34/35] fixing --- updatecli/values.github-action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/updatecli/values.github-action.yaml b/updatecli/values.github-action.yaml index ab1a86de42c4..73212acc211c 100644 --- a/updatecli/values.github-action.yaml +++ b/updatecli/values.github-action.yaml @@ -3,6 +3,6 @@ github: email: "41898282+github-actions[bot]@users.noreply.github.com" username: "github-actions" token: "UPDATECLI_GITHUB_TOKEN" - branch: "main" + branch: "master" owner: "jenkins-infra" repository: "jenkins.io" From 8c6f58a6b54332c0f9e28f278a8a3c5f26f7338a Mon Sep 17 00:00:00 2001 From: Birajit Saikia Date: Thu, 3 Apr 2025 22:16:33 +0530 Subject: [PATCH 35/35] brought back the files --- .github/ISSUE_TEMPLATE/1-documentation.yml | 2 +- .github/ISSUE_TEMPLATE/2-wiki-migration.yml | 2 +- .github/ISSUE_TEMPLATE/3-enhancement.yml | 2 +- .github/ISSUE_TEMPLATE/4-bug.yml | 2 +- .github/dependabot.yml | 2 +- .github/workflows/compress-images.yaml | 4 ++-- .github/workflows/updatecli.yaml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/1-documentation.yml b/.github/ISSUE_TEMPLATE/1-documentation.yml index df2c5282e355..57d505de0125 100644 --- a/.github/ISSUE_TEMPLATE/1-documentation.yml +++ b/.github/ISSUE_TEMPLATE/1-documentation.yml @@ -18,4 +18,4 @@ body: - type: textarea attributes: label: Are you interested in contributing a fix? - description: Indicate if this is something you would like to work on, and how we can best support you in doing so. More details [on contributing](https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc) + description: Indicate if this is something you would like to work on, and how we can best support you in doing so. More details [on contributing](https://github.com/jenkins-infra/jenkins.io/blob/main/CONTRIBUTING.adoc) diff --git a/.github/ISSUE_TEMPLATE/2-wiki-migration.yml b/.github/ISSUE_TEMPLATE/2-wiki-migration.yml index 18174d66f8f4..c187cd4f6fd0 100644 --- a/.github/ISSUE_TEMPLATE/2-wiki-migration.yml +++ b/.github/ISSUE_TEMPLATE/2-wiki-migration.yml @@ -24,4 +24,4 @@ body: id: info attributes: value: | - For contributors: [Wiki Migration Guidelines](https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc#moving-documentation-from-jenkins-wiki) + For contributors: [Wiki Migration Guidelines](https://github.com/jenkins-infra/jenkins.io/blob/main/CONTRIBUTING.adoc#moving-documentation-from-jenkins-wiki) diff --git a/.github/ISSUE_TEMPLATE/3-enhancement.yml b/.github/ISSUE_TEMPLATE/3-enhancement.yml index a268fd24ec36..7cfaba3d670c 100644 --- a/.github/ISSUE_TEMPLATE/3-enhancement.yml +++ b/.github/ISSUE_TEMPLATE/3-enhancement.yml @@ -22,4 +22,4 @@ body: - type: textarea attributes: label: Are you interested in contributing to this improvement? - description: Indicate if this is something you would like to work on, and how we can best support you in doing so. More details [on contributing](https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc) + description: Indicate if this is something you would like to work on, and how we can best support you in doing so. More details [on contributing](https://github.com/jenkins-infra/jenkins.io/blob/main/CONTRIBUTING.adoc) diff --git a/.github/ISSUE_TEMPLATE/4-bug.yml b/.github/ISSUE_TEMPLATE/4-bug.yml index 20dd603241cf..2281f62b04f2 100644 --- a/.github/ISSUE_TEMPLATE/4-bug.yml +++ b/.github/ISSUE_TEMPLATE/4-bug.yml @@ -34,4 +34,4 @@ body: - type: textarea attributes: label: Are you interested in contributing a fix? - description: Indicate if this is something you would like to work on, and how we can best support you in doing so. More details [on contributing](https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc) + description: Indicate if this is something you would like to work on, and how we can best support you in doing so. More details [on contributing](https://github.com/jenkins-infra/jenkins.io/blob/main/CONTRIBUTING.adoc) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 668d0c5aae35..b5be0219514b 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,7 +4,7 @@ updates: # GitHub actions - package-ecosystem: "github-actions" - target-branch: master + target-branch: main directory: "/" schedule: # Check for updates to GitHub Actions every week diff --git a/.github/workflows/compress-images.yaml b/.github/workflows/compress-images.yaml index fdb3321b204c..b1a560bf027c 100644 --- a/.github/workflows/compress-images.yaml +++ b/.github/workflows/compress-images.yaml @@ -1,6 +1,6 @@ # Image Actions will run in the following scenarios: # - on Pull Requests containing images (not including forks) -# - on pushing of images to `master` (for forks) +# - on pushing of images to `main` (for forks) # - on demand (https://github.blog/changelog/2020-07-06-github-actions-manual-triggers-with-workflow_dispatch/) # - at 11 PM every Sunday in anything gets missed with any of the above scenarios # For Pull Requests, the images are added to the PR. @@ -15,7 +15,7 @@ on: - '**.webp' push: branches: - - master + - main paths: - '**.jpg' - '**.jpeg' diff --git a/.github/workflows/updatecli.yaml b/.github/workflows/updatecli.yaml index 1643a8c7403b..2c73cf9e769d 100644 --- a/.github/workflows/updatecli.yaml +++ b/.github/workflows/updatecli.yaml @@ -24,7 +24,7 @@ jobs: UPDATECLI_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Run Updatecli in Apply mode - if: github.ref == 'refs/heads/master' + if: github.ref == 'refs/heads/main' run: updatecli apply --config ./updatecli/updatecli.d --values ./updatecli/values.github-action.yaml env: UPDATECLI_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}