Update CI and publishing to work on main. (#429)
This commit is contained in:
Родитель
1c8ebc059a
Коммит
93264f87f6
|
@ -4,9 +4,11 @@ on:
|
|||
push:
|
||||
branches:
|
||||
- master
|
||||
- main
|
||||
pull_request:
|
||||
branches:
|
||||
- master
|
||||
- main
|
||||
|
||||
jobs:
|
||||
xcodebuild:
|
||||
|
|
|
@ -4,6 +4,7 @@ on:
|
|||
push:
|
||||
branches:
|
||||
- master
|
||||
- main
|
||||
paths:
|
||||
- '**.strings'
|
||||
- '**.stringsdict'
|
||||
|
|
|
@ -6,7 +6,7 @@ on:
|
|||
|
||||
jobs:
|
||||
Pod-Publish:
|
||||
if: github.event.base_ref == 'refs/heads/master'
|
||||
if: github.event.base_ref == 'refs/heads/main'
|
||||
runs-on: macOS-10.15
|
||||
|
||||
steps:
|
||||
|
|
|
@ -8,7 +8,7 @@ if [ -n "$BUILD_NUMBER_SUFFIX_OVERRIDE" ]; then
|
|||
# Allow someone calling us to provide an override to always add a suffix to a given build number by providing an env variable
|
||||
ADJUSTED_BUILD_NUMBER_SUFFIX_OVERRIDE="${BUILD_NUMBER_SUFFIX_OVERRIDE//[^a-z0-9A-Z]/}"
|
||||
BUILD_VERSION_SUFFIX="-$ADJUSTED_BUILD_NUMBER_SUFFIX_OVERRIDE"
|
||||
elif [ -n "$BUILD_SOURCEBRANCHNAME" ] && [ "$BUILD_SOURCEBRANCHNAME" != "master" ]; then
|
||||
elif [ -n "$BUILD_SOURCEBRANCHNAME" ] && [ "$BUILD_SOURCEBRANCHNAME" != "main" ]; then
|
||||
# Otherwise append the branch name unless we're the main branch for this repo
|
||||
ADJUSTED_SOURCEBRANCHNAME="${BUILD_SOURCEBRANCHNAME//[^a-z0-9A-Z]/}"
|
||||
BUILD_VERSION_SUFFIX="-$ADJUSTED_SOURCEBRANCHNAME"
|
||||
|
|
Загрузка…
Ссылка в новой задаче