Skip to content

Commit

Permalink
treewide: rename master branch to main
Browse files Browse the repository at this point in the history
  • Loading branch information
pktpls committed May 29, 2024
1 parent 8f55c7c commit d974395
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,5 @@ jobs:
uses: github/super-linter@v5
env:
VALIDATE_ALL_CODEBASE: false
# Change to 'master' if your main branch differs
DEFAULT_BRANCH: master
DEFAULT_BRANCH: main
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6 changes: 3 additions & 3 deletions build_falter
Original file line number Diff line number Diff line change
Expand Up @@ -367,9 +367,9 @@ printf "\tdone.\n"
# get OpenWrt ToH
build_router_db

# if openwrt_base is "master": change to "snapshots". That is the correct
# directory for downloading openwrt-master
if [ "$FREIFUNK_OPENWRT_BASE" == "master" ] || [ "$FREIFUNK_OPENWRT_BASE" == "snapshot" ] ; then
# if openwrt_base is "main": change to "snapshots". That is the correct
# directory for downloading openwrt main
if [ "$FREIFUNK_OPENWRT_BASE" == "main" ] || [ "$FREIFUNK_OPENWRT_BASE" == "snapshot" ] ; then
RELEASE_LINK_BASE="https://downloads.openwrt.org/"
FREIFUNK_OPENWRT_BASE="snapshots"
fi
Expand Down
4 changes: 2 additions & 2 deletions lib.bash
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,8 @@ function generate_embedded_files {

# Get the FREIFUNK_RELEASE variable from the falter feed
# located in the falter-common package.
[ "snapshot" == "$FALTERBRANCH" ] && FALTERBRANCH="master"
[ "$FALTERBRANCH" != "master" ] && FALTERBRANCH="openwrt-$OPENWRT_BASE_VERSION"
[ "snapshot" == "$FALTERBRANCH" ] && FALTERBRANCH="main"
[ "$FALTERBRANCH" != "main" ] && FALTERBRANCH="openwrt-$OPENWRT_BASE_VERSION"

# clear out any old embedded_files
rm -rf ../../embedded-files/*
Expand Down

0 comments on commit d974395

Please sign in to comment.