updated scripts for main branch name

This commit is contained in:
Jonathan Shook 2020-06-15 11:03:47 -05:00
parent ddc44bef64
commit d57835e436
3 changed files with 5 additions and 5 deletions

View File

@ -2,7 +2,7 @@ name: build
on: on:
push: push:
branches: master branches: main
paths: paths:
- '!RELEASENOTES.**' - '!RELEASENOTES.**'

View File

@ -87,7 +87,7 @@ jobs:
- name: prepare release - name: prepare release
run: scripts/release-prepare.sh run: scripts/release-prepare.sh
env: env:
RELEASE_BRANCH_NAME: "master" RELEASE_BRANCH_NAME: "main"
GIT_RELEASE_BOT_NAME: "nb-droid" GIT_RELEASE_BOT_NAME: "nb-droid"
GIT_RELEASE_BOT_EMAIL: ${{ secrets.GIT_RELEASE_BOT_EMAIL }} GIT_RELEASE_BOT_EMAIL: ${{ secrets.GIT_RELEASE_BOT_EMAIL }}
ACCESS_TOKEN: ${{ secrets.GITHUB_ACCESS_TOKEN }} ACCESS_TOKEN: ${{ secrets.GITHUB_ACCESS_TOKEN }}
@ -104,7 +104,7 @@ jobs:
run: scripts/release-perform.sh run: scripts/release-perform.sh
continue-on-error: true continue-on-error: true
env: env:
RELEASE_BRANCH_NAME: "master" RELEASE_BRANCH_NAME: "main"
GIT_RELEASE_BOT_NAME: "nb-droid" GIT_RELEASE_BOT_NAME: "nb-droid"
GIT_RELEASE_BOT_EMAIL: ${{ secrets.GIT_RELEASE_BOT_EMAIL }} GIT_RELEASE_BOT_EMAIL: ${{ secrets.GIT_RELEASE_BOT_EMAIL }}
ACCESS_TOKEN: ${{ secrets.GITHUB_ACCESS_TOKEN }} ACCESS_TOKEN: ${{ secrets.GITHUB_ACCESS_TOKEN }}

View File

@ -2,9 +2,9 @@
set -e set -e
#RELEASE_NOTES_FILE=${RELEASE_NOTES_FILE:?RELEASE_NOTES_FILE must be provided} #RELEASE_NOTES_FILE=${RELEASE_NOTES_FILE:?RELEASE_NOTES_FILE must be provided}
git log --oneline --decorate --max-count=1000 master > /tmp/gitlog_master git log --oneline --decorate --max-count=1000 main > /tmp/gitlog_main
readarray lines < /tmp/gitlog_master readarray lines < /tmp/gitlog_main
for line in "${lines[@]}" for line in "${lines[@]}"
do do
if [[ $line =~ \(tag:\ nosqlbench-[0-9]+\.[0-9]+\.[0-9]+\).+ ]] if [[ $line =~ \(tag:\ nosqlbench-[0-9]+\.[0-9]+\.[0-9]+\).+ ]]