From 54bb12bcc0038a22cdf1025aaaf92bdc8a5f7064 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Wro=C5=84ski?= Date: Mon, 7 Feb 2022 20:29:12 +0100 Subject: [PATCH] Renaming default branch to main --- .github/workflows/ci.yml | 6 +++--- .github/workflows/website.yaml | 6 +++--- README.md | 2 +- build.sc | 10 +++++----- .../main/scala/scala/build/options/ScalaOptions.scala | 2 +- .../cli/src/main/scala/scala/cli/commands/Fmt.scala | 3 +-- scala-cli.bat | 2 +- scala-cli.sh | 2 +- website/docs/_advanced_install.mdx | 4 ++-- website/docusaurus.config.js | 2 +- 10 files changed, 19 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6d64d535cc..d61d411242 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,7 +2,7 @@ name: CI on: push: branches: - - master + - main tags: - "v*" pull_request: @@ -10,7 +10,7 @@ on: concurrency: group: ${{ github.ref }} - cancel-in-progress: ${{ github.ref != 'refs/heads/master' }} + cancel-in-progress: ${{ github.ref != 'refs/heads/main' }} jobs: bloop-memory-footprint: @@ -320,7 +320,7 @@ jobs: with: type: now message: 'Back port of documentation changes to stable' - from_branch: master + from_branch: main target_branch: stable github_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/website.yaml b/.github/workflows/website.yaml index 6ae76433ed..ebe89364b4 100644 --- a/.github/workflows/website.yaml +++ b/.github/workflows/website.yaml @@ -21,11 +21,11 @@ jobs: DEPLOYMENT_BRANCH: gh-pages GIT_PASS: ${{ secrets.GITHUB_TOKEN }} # after the release the PR should be empty - - name: Open PR with changes back to master + - name: Open PR with changes back to main uses: repo-sync/pull-request@v2 with: - destination_branch: "master" + destination_branch: "main" github_token: ${{ secrets.GITHUB_TOKEN }} - pr_title: "Back port of documentation changes to master" + pr_title: "Back port of documentation changes to main" name: Update stable branch branch: backport/stable \ No newline at end of file diff --git a/README.md b/README.md index b15f5c0ec1..0d2735eb0e 100644 --- a/README.md +++ b/README.md @@ -174,4 +174,4 @@ Just add it to your PATH to get the already-released-scala-cli experience. ## Releases -Instructions on how to release - [Release Procedure](https://github.com/VirtusLab/scala-cli/blob/master/.github/release/release-procedure.md) \ No newline at end of file +Instructions on how to release - [Release Procedure](https://github.com/VirtusLab/scala-cli/blob/main/.github/release/release-procedure.md) \ No newline at end of file diff --git a/build.sc b/build.sc index dcd6b20e13..0cd2a7818a 100644 --- a/build.sc +++ b/build.sc @@ -779,7 +779,7 @@ object ci extends Module { if (os.exists(scalaCliDir)) os.remove.all(scalaCliDir) if (!os.exists(targetDir)) os.makeDir.all(targetDir) - val branch = "master" + val branch = "main" val repo = s"https://oauth2:${ghToken()}@github.com/VirtusLab/scala-cli.git" // Cloning @@ -862,7 +862,7 @@ object ci extends Module { os.makeDir.all(targetDir) - val branch = "master" + val branch = "main" val repo = s"git@github.com:Virtuslab/scala-cli-packages.git" // Cloning @@ -889,7 +889,7 @@ object ci extends Module { os.makeDir.all(targetDir) - val branch = "master" + val branch = "main" val repo = s"git@github.com:Virtuslab/scala-cli-packages.git" // Cloning @@ -943,7 +943,7 @@ object ci extends Module { ) .call(cwd = debianDir, stdin = pgpPassphrase, stdout = inReleasePath) - commitChanges(s"Update Debian packages for $version", "master", packagesDir) + commitChanges(s"Update Debian packages for $version", branch, packagesDir) } def updateCentOsPackages() = T.command { val version = cli.publishVersion() @@ -957,7 +957,7 @@ object ci extends Module { os.makeDir.all(targetDir) - val branch = "master" + val branch = "main" val repo = s"git@github.com:Virtuslab/scala-cli-packages.git" // Cloning diff --git a/modules/build/src/main/scala/scala/build/options/ScalaOptions.scala b/modules/build/src/main/scala/scala/build/options/ScalaOptions.scala index ef077d18ee..e17de05ca4 100644 --- a/modules/build/src/main/scala/scala/build/options/ScalaOptions.scala +++ b/modules/build/src/main/scala/scala/build/options/ScalaOptions.scala @@ -18,7 +18,7 @@ final case class ScalaOptions( ) { lazy val scalaVersionsUrl = supportedScalaVersionsUrl.getOrElse( - "https://github.com/VirtuslabRnD/scala-cli-scala-versions/raw/master/scala-versions-v1.json" + "https://github.com/VirtusLab/scala-cli-scala-versions/raw/main/scala-versions-v1.json" ) def normalize: ScalaOptions = { diff --git a/modules/cli/src/main/scala/scala/cli/commands/Fmt.scala b/modules/cli/src/main/scala/scala/cli/commands/Fmt.scala index 291b70f0b3..f9636995f0 100644 --- a/modules/cli/src/main/scala/scala/cli/commands/Fmt.scala +++ b/modules/cli/src/main/scala/scala/cli/commands/Fmt.scala @@ -32,8 +32,7 @@ object Fmt extends ScalaCommand[FmtOptions] { } // Based on scalafmt comment: - // https://github.com/scalameta/scalafmt/blob/master/scalafmt-cli/src/main/scala/org/scalafmt/cli/CliArgParser.scala - // commit d0c11e98898334969f5f4dfc4bd511630cf00ab9 + // https://github.com/scalameta/scalafmt/blob/d0c11e98898334969f5f4dfc4bd511630cf00ab9/scalafmt-cli/src/main/scala/org/scalafmt/cli/CliArgParser.scala // First we look for the file in the cwd. // If not found or could not read, we go to the git root and look there. // If not found or could not read, we use the default version. diff --git a/scala-cli.bat b/scala-cli.bat index 1c9c8b63f8..e148b15e50 100644 --- a/scala-cli.bat +++ b/scala-cli.bat @@ -3,7 +3,7 @@ rem This is the launcher script of Scala CLI (https://github.com/VirtusLab/scala-cli). rem This script downloads and runs the Scala CLI version set by SCALA_CLI_VERSION below. rem -rem Download the latest version of this script at https://github.com/VirtusLab/scala-cli/raw/master/scala-cli.bat +rem Download the latest version of this script at https://github.com/VirtusLab/scala-cli/raw/main/scala-cli.bat setlocal enabledelayedexpansion diff --git a/scala-cli.sh b/scala-cli.sh index 68ca9c01bb..9976729b21 100755 --- a/scala-cli.sh +++ b/scala-cli.sh @@ -3,7 +3,7 @@ # This is the launcher script of Scala CLI (https://github.com/VirtusLab/scala-cli). # This script downloads and runs the Scala CLI version set by SCALA_CLI_VERSION below. # -# Download the latest version of this script at https://github.com/VirtusLab/scala-cli/raw/master/scala-cli.sh +# Download the latest version of this script at https://github.com/VirtusLab/scala-cli/raw/main/scala-cli.sh set -eu diff --git a/website/docs/_advanced_install.mdx b/website/docs/_advanced_install.mdx index ccde83dc62..b255cb213c 100644 --- a/website/docs/_advanced_install.mdx +++ b/website/docs/_advanced_install.mdx @@ -291,12 +291,12 @@ Script to automatically download and cache standalone `scala-cli` launcher. ]}> - + - + diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js index c9eb8917eb..73f09026b5 100644 --- a/website/docusaurus.config.js +++ b/website/docusaurus.config.js @@ -134,7 +134,7 @@ module.exports = { sidebarPath: require.resolve('./sidebars.js'), // Please change this to your repo. editUrl: - 'https://github.com/Virtuslab/scala-cli/edit/master/website/', + 'https://github.com/Virtuslab/scala-cli/edit/main/website/', }, theme: { // customCss: require.resolve('./src/css/custom.css'),