Skip to content

Commit c987e9b

Browse files
committed
Update references for default branch rename
1 parent e1b3f96 commit c987e9b

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ ENV PERL5LIB='PERL5LIB=/opt/rh/devtoolset-7/root/usr/lib64/perl5/vendor_perl:/op
5656
PYTHONPATH=/opt/rh/devtoolset-7/root/usr/lib64/python2.7/site-packages:/opt/rh/devtoolset-7/root/usr/lib/python2.7/site-packages \
5757
PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
5858

59-
# Compile and install lua_sandbox and hindsight using master branch
59+
# Compile and install lua_sandbox and hindsight using main branch
6060
RUN git clone https://github.com/mozilla-services/lua_sandbox && \
6161
git clone https://github.com/mozilla-services/hindsight && \
6262
mkdir -p lua_sandbox/release && cd lua_sandbox/release && \

README.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -45,33 +45,33 @@ decoupling the module and business logic maintenance and deployment.
4545
### Docker Images
4646

4747
Docker images [are built](https://hub.docker.com/r/mozilla/lua_sandbox_extensions/) from
48-
the `dev` and `master` branches. These images contain [hindsight](https://github.com/mozilla-services/hindsight),
48+
the `dev` and `main` branches. These images contain [hindsight](https://github.com/mozilla-services/hindsight),
4949
[lua_sandbox](https://github.com/mozilla-services/lua_sandbox) and have all of the extensions
5050
from this repository installed.
5151

52-
# Get master branch docker image
53-
docker pull mozilla/lua_sandbox_extensions:master
54-
52+
# Get main branch docker image
53+
docker pull mozilla/lua_sandbox_extensions:main
54+
5555
# Get dev branch docker image
5656
docker pull mozilla/lua_sandbox_extensions:dev
5757

5858
## Releases
5959

60-
* The master branch is the current release and is considered stable at all
60+
* The main branch is the current release and is considered stable at all
6161
times.
6262
* New versions can be released as frequently as every two weeks (our sprint
6363
cycle). The only exception would be for a high priority patch.
6464
* All active work is flagged with the sprint milestone and tracked in the
6565
project dashboard.
6666
* New releases occur the day after the sprint finishes.
6767
* The version in the dev branch is updated
68-
* The changes are merged into master
68+
* The changes are merged into main
6969
* A new tag is created
7070

7171
## Contributions
7272

7373
* All pull requests must be made against the dev branch, direct commits to
74-
master are not permitted.
74+
main are not permitted.
7575
* All non trivial contributions should start with an issue being filed (if it is
7676
a new feature please propose your design/approach before doing any work as not
7777
all feature requests are accepted).

artifact_push.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
curl -sL https://raw.githubusercontent.com/travis-ci/artifacts/master/install | bash
2+
curl -sL https://raw.githubusercontent.com/travis-ci/artifacts/main/install | bash
33
tar -C dist -zcvf all.tgz .
44

55
export ARTIFACTS_PERMISSIONS="public-read"

docker_push.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/bin/bash
22

33
tag=""
4-
if [[ $1 = "master" ]]; then
5-
tag="mozilla/lua_sandbox_extensions:master"
4+
if [[ $1 = "main" ]]; then
5+
tag="mozilla/lua_sandbox_extensions:main"
66
elif [[ $1 = "dev" ]]; then
77
tag="mozilla/lua_sandbox_extensions:dev"
88
elif [[ $1 = "test" ]]; then

gen_gh_pages.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ local function extract_lua_docs(path, paths)
150150
local ofh = assert(io.open(string.format("%s/%s", output_dir, outfn), "w"))
151151
p.entries[get_filename(line)] = {line = line, title = title}
152152
ofh:write(doc)
153-
ofh:write(string.format("\n\nsource code: [%s](https://github.com/mozilla-services/lua_sandbox_extensions/blob/master/%s)\n", get_filename(line), line))
153+
ofh:write(string.format("\n\nsource code: [%s](https://github.com/mozilla-services/lua_sandbox_extensions/blob/main/%s)\n", get_filename(line), line))
154154
ofh:close()
155155
end
156156
fh:close()

0 commit comments

Comments
 (0)