Skip to content

Commit

Permalink
Merge pull request #246 from tloncorp/hm/change-to-develop
Browse files Browse the repository at this point in the history
ops: point to develop as default
  • Loading branch information
arthyn authored Dec 7, 2023
2 parents 3121d3e + 407345b commit f34d17c
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/actions/glob/action.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: 'glob'
description: 'Create a glob and push to master'
description: 'Create a glob and push to develop'
inputs:
folder:
description: "Folder to glob"
Expand Down
2 changes: 1 addition & 1 deletion .github/helpers/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ desk=$2
ship=$3
zone=$4
project=$5
ref=${6:-master}
ref=${6:-develop}
folder=$ship/$desk

set -e
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bump.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
jobs:
deploy:
runs-on: ubuntu-latest
name: "Bumps versions and pushes to master"
name: "Bumps versions and pushes to develop"
steps:
- uses: actions/checkout@v3
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy-kernel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
tag:
type: string
required: false
default: master
default: develop
description: Enter the tag to deploy
jobs:
build-frontend:
Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:
git add desk/desk.docket-0
git commit -n -m "update glob: ${{ steps.glob.outputs.hash }} [skip actions]" || echo "No changes to commit"
INPUT=${{ github.event.inputs.tag }}
BRANCH=${INPUT:-"master"}
BRANCH=${INPUT:-"develop"}
git pull origin $BRANCH --rebase --autostash
git push
deploy:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ on:
tag:
type: string
required: false
default: master
default: develop
description: Enter the tag to deploy
push:
branches:
- 'master'
- 'develop'
jobs:
build-frontend:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -61,7 +61,7 @@ jobs:
git add desk/desk.docket-0
git commit -n -m "update glob: ${{ steps.glob.outputs.hash }} [skip actions]" || echo "No changes to commit"
INPUT=${{ github.event.inputs.tag }}
BRANCH=${INPUT:-"master"}
BRANCH=${INPUT:-"develop"}
git pull origin $BRANCH --rebase --autostash
git push
deploy:
Expand Down

0 comments on commit f34d17c

Please sign in to comment.