Skip to content

Commit

Permalink
chore: rename master to main. Fixes quarkusio#870
Browse files Browse the repository at this point in the history
  • Loading branch information
maxandersen committed May 16, 2021
1 parent 20ad466 commit 326eca3
Show file tree
Hide file tree
Showing 10 changed files with 19 additions and 19 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ name: ci-build
on:
push:
branches:
- master
- main
tags-ignore:
- '*.*'
pull_request:
branches:
- master
- main

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion itests/jbang-catalog.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"catalogs": {
"test": {
"catalog-ref": "https://raw.githubusercontent.com/jbangdev/jbang/master/itests/jbang-catalog.json",
"catalog-ref": "https://raw.githubusercontent.com/jbangdev/jbang/main/itests/jbang-catalog.json",
"description": "JBang test scripts"
}
},
Expand Down
2 changes: 1 addition & 1 deletion itests/run.feature
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Scenario: java run multiple files using alias
Then match out contains "hello properties"

Scenario: java run multiple files using remote alias
When command('jbang catalog add --name test https://raw.githubusercontent.com/jbangdev/jbang/master/itests/jbang-catalog.json')
When command('jbang catalog add --name test https://raw.githubusercontent.com/jbangdev/jbang/HEAD/itests/jbang-catalog.json')
Then command('jbang trust add https://raw.githubusercontent.com')
Then command('jbang resource@test')
Then match out contains "hello properties"
Expand Down
4 changes: 2 additions & 2 deletions itests/test_suite.sh
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ assert "grep -c $SCRATCH/testrepo ~/.jbang/cache/dependency_cache.json" 1
assert_stderr "jbang classpath_log.java" ""

## test urls
assert "jbang trust add raw.githubusercontent.com/jbangdev https://raw.githubusercontent.com/jbangdev/jbang/master/itests/helloworld.java" ""
assert "jbang https://raw.githubusercontent.com/jbangdev/jbang/master/itests/helloworld.java viaurl" "Hello viaurl"
assert "jbang trust add raw.githubusercontent.com/jbangdev https://raw.githubusercontent.com/jbangdev/jbang/HEAD/itests/helloworld.java" ""
assert "jbang https://raw.githubusercontent.com/jbangdev/jbang/HEAD/itests/helloworld.java viaurl" "Hello viaurl"

## test that can figure out main class with dual classes
assert "jbang dualclass.java" "Hello World"
Expand Down
6 changes: 3 additions & 3 deletions readme.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -1210,7 +1210,7 @@ You can put `//CDS` in the java file to enable it by default, or simply use `--c
To avoid remembering long paths and to enable easy launch of jbang scripts there is an `alias` command
to setup and manage aliases to actual scripts.

jbang alias add hello https://github.com/jbangdev/jbang-examples/blob/master/examples/helloworld.java
jbang alias add hello https://github.com/jbangdev/jbang-examples/blob/HEAD/examples/helloworld.java

will add an alias named `hello` pointing to that github url which then can be run using `jbang hello`.

Expand Down Expand Up @@ -1274,7 +1274,7 @@ looking until it finds a file to use (as a last option it will always be written
This means that if you want to write the alias to `jbang-catalog.json` in your local folder you will either have to create
the file first (eg by running `touch jbang-catalog.json`) or by explicitly specifying the file location:

jbang alias add -f jbang-catalog.json hello https://github.com/jbangdev/jbang-examples/blob/master/examples/helloworld.java
jbang alias add -f jbang-catalog.json hello https://github.com/jbangdev/jbang-examples/blob/HEAD/examples/helloworld.java

Btw, the flag `--show-origin` is very useful when listing aliases to find out where exactly an alias is defined:

Expand All @@ -1286,7 +1286,7 @@ Catalogs are lists of Aliases as defined in the previous section, but while the
within a catalog, the `catalog` command is for managing references to catalogs. This is mostly useful when dealing with
remote catalogs. You can for example add a catalog like this:

jbang catalog add --name demo https://github.com/jbangdev/jbang-catalog/blob/master/jbang-catalog.json
jbang catalog add --name demo https://github.com/jbangdev/jbang-catalog/blob/HEAD/jbang-catalog.json

or simply by using the same "implicit" catalog system described in <<Implicit Alias Catalogs>>:

Expand Down
4 changes: 2 additions & 2 deletions src/main/scripts/choco/jbang.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
<authors>Max Rydahl Andersen</authors>
<projectUrl>https://github.com/jbangdev/jbang</projectUrl>
<copyright>2020 Max Rydahl Andersen</copyright>
<licenseUrl>https://github.com/jbangdev/jbang/blob/master/LICENSE</licenseUrl>
<licenseUrl>https://github.com/jbangdev/jbang/blob/HEAD/LICENSE</licenseUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<projectSourceUrl>https://github.com/jbangdev/jbang</projectSourceUrl>
<packageSourceUrl>https://github.com/jbangdev/jbang/tree/master/src/main/scripts/choco</packageSourceUrl>
<docsUrl>https://github.com/jbangdev/jbang/blob/master/readme.adoc</docsUrl>
<docsUrl>https://github.com/jbangdev/jbang/blob/HEAD/readme.adoc</docsUrl>
<bugTrackerUrl>https://github.com/jbangdev/jbang/issues</bugTrackerUrl>
<tags>jbang bash java shell scripting</tags>
<summary>Unleash the power of Java. Use `jbang` to run single .java or .jar file with automatic dependency fetching and immediate compilation and execution.</summary>
Expand Down
2 changes: 1 addition & 1 deletion src/main/scripts/choco/tools/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From: https://raw.githubusercontent.com/jbangdev/jbang/master/LICENSE
From: https://raw.githubusercontent.com/jbangdev/jbang/HEAD/LICENSE

MIT License

Expand Down
2 changes: 1 addition & 1 deletion src/main/scripts/container/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This container intended for quick and easily run java based scripts with [jbang]

Can be used directly with docker or as a GitHub Action.

The source is located in [jbangdev/jbang](https://github.com/jbangdev/jbang/blob/master/src/main/scripts/container/) and are updated in this repo on every tag/release of jbangdev/jbang.
The source is located in [jbangdev/jbang](https://github.com/jbangdev/jbang/blob/HEAD/src/main/scripts/container/) and are updated in this repo on every tag/release of jbangdev/jbang.

[Source](https://github.com/jbangdev/jbang-action)

Expand Down
4 changes: 2 additions & 2 deletions src/test/java/dev/jbang/cli/TestCatalogNearest.java
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ void testAddLocalFile() throws IOException {

@Test
void testAddLocalUrl() throws IOException {
testAddLocal("https://github.com/jbangdev/jbang-catalog/blob/master/jbang-catalog.json",
"https://github.com/jbangdev/jbang-catalog/blob/master/jbang-catalog.json");
testAddLocal("https://github.com/jbangdev/jbang-catalog/blob/HEAD/jbang-catalog.json",
"https://github.com/jbangdev/jbang-catalog/blob/HEAD/jbang-catalog.json");
}

@Test
Expand Down
8 changes: 4 additions & 4 deletions src/test/java/dev/jbang/cli/TestRun.java
Original file line number Diff line number Diff line change
Expand Up @@ -899,12 +899,12 @@ void testTwitterjsh(@TempDir Path dir) throws IOException {
void testSwizzle(@TempDir Path dir) throws IOException {

assertThat(
Util.swizzleURL("https://github.com/jbangdev/jbang/blob/master/examples/helloworld.java"),
equalTo("https://raw.githubusercontent.com/jbangdev/jbang/master/examples/helloworld.java"));
Util.swizzleURL("https://github.com/jbangdev/jbang/blob/HEAD/examples/helloworld.java"),
equalTo("https://raw.githubusercontent.com/jbangdev/jbang/HEAD/examples/helloworld.java"));

assertThat(
Util.swizzleURL("https://gitlab.com/jbangdev/jbang-gitlab/-/blob/master/helloworld.java"),
equalTo("https://gitlab.com/jbangdev/jbang-gitlab/-/raw/master/helloworld.java"));
Util.swizzleURL("https://gitlab.com/jbangdev/jbang-gitlab/-/blob/HEAD/helloworld.java"),
equalTo("https://gitlab.com/jbangdev/jbang-gitlab/-/raw/HEAD/helloworld.java"));

assertThat(
Util.swizzleURL("https://bitbucket.org/Shoeboom/test/src/master/helloworld.java"),
Expand Down

0 comments on commit 326eca3

Please sign in to comment.