From 407345bdc4f28d926f739a6290752551108061e1 Mon Sep 17 00:00:00 2001 From: Hunter Miller Date: Thu, 7 Dec 2023 10:52:15 -0600 Subject: [PATCH] ops: point to develop as default --- .github/actions/glob/action.yml | 2 +- .github/helpers/deploy.sh | 2 +- .github/workflows/bump.yml | 2 +- .github/workflows/deploy-kernel.yml | 4 ++-- .github/workflows/deploy.yml | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/actions/glob/action.yml b/.github/actions/glob/action.yml index dd9f0100..362a2553 100644 --- a/.github/actions/glob/action.yml +++ b/.github/actions/glob/action.yml @@ -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" diff --git a/.github/helpers/deploy.sh b/.github/helpers/deploy.sh index addab6ef..439a9d24 100755 --- a/.github/helpers/deploy.sh +++ b/.github/helpers/deploy.sh @@ -8,7 +8,7 @@ desk=$2 ship=$3 zone=$4 project=$5 -ref=${6:-master} +ref=${6:-develop} folder=$ship/$desk set -e diff --git a/.github/workflows/bump.yml b/.github/workflows/bump.yml index d65505cb..eac14548 100644 --- a/.github/workflows/bump.yml +++ b/.github/workflows/bump.yml @@ -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: diff --git a/.github/workflows/deploy-kernel.yml b/.github/workflows/deploy-kernel.yml index 2955823e..003853f9 100644 --- a/.github/workflows/deploy-kernel.yml +++ b/.github/workflows/deploy-kernel.yml @@ -5,7 +5,7 @@ on: tag: type: string required: false - default: master + default: develop description: Enter the tag to deploy jobs: build-frontend: @@ -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: diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index e6525484..ac57225f 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -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 @@ -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: