Skip to content

Commit 795af85

Browse files
committed
Use pre instead of rc, per review suggestion
1 parent 24075c9 commit 795af85

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

.github/workflows/installer-macos.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ on:
2020

2121
push:
2222
tags:
23-
- v*rc*
23+
- v*pre*
2424

2525
concurrency:
2626
group: installer-macos-${{ github.ref }}
@@ -29,7 +29,7 @@ concurrency:
2929
name: Create macOS App Bundle and DMG
3030

3131
env:
32-
IS_RC: ${{ github.event_name == 'push' && github.ref_type == 'tag' }}
32+
IS_PRE: ${{ github.event_name == 'push' && github.ref_type == 'tag' }}
3333

3434
jobs:
3535
matrix_prep:
@@ -40,7 +40,7 @@ jobs:
4040
steps:
4141
- id: set-matrix
4242
run: |
43-
if [[ ${GITHUB_EVENT_NAME} == 'release' || ${IS_RC} == 'true' ]]; then
43+
if [[ ${GITHUB_EVENT_NAME} == 'release' || ${IS_PRE} == 'true' ]]; then
4444
build_type=$(echo "['Full', 'Lite']")
4545
else
4646
build_type=$(echo "['Full']")
@@ -103,10 +103,10 @@ jobs:
103103
- name: Build Application Bundle
104104
run: ${pythonLocation}/bin/python setup.py ${LITE_FLAG} --dist-dir ${DISTDIR}
105105
- name: Create Keychain
106-
if: ${{github.event_name == 'release' || env.IS_RC == 'true'}}
106+
if: ${{github.event_name == 'release' || env.IS_PRE == 'true'}}
107107
run: ./certkeychain.sh "${MACOS_CERTIFICATE}" "${MACOS_CERTIFICATE_PWD}"
108108
- name: Code Sign Application
109-
if: ${{github.event_name == 'release' || env.IS_RC == 'true'}}
109+
if: ${{github.event_name == 'release' || env.IS_PRE == 'true'}}
110110
run: |
111111
pil=$(${pythonLocation}/bin/python -c "import PIL, os; print(os.path.dirname(PIL.__file__))")
112112
rm -v ${DISTDIR}/Spyder.app/Contents/Frameworks/liblzma.5.dylib
@@ -117,10 +117,10 @@ jobs:
117117
- name: Build Disk Image
118118
run: ${pythonLocation}/bin/python setup.py ${LITE_FLAG} --dist-dir ${DISTDIR} --dmg --no-app
119119
- name: Sign Disk Image
120-
if: ${{github.event_name == 'release' || env.IS_RC == 'true'}}
120+
if: ${{github.event_name == 'release' || env.IS_PRE == 'true'}}
121121
run: ./codesign.sh "${DISTDIR}/${DMGNAME}"
122122
- name: Notarize Disk Image
123-
if: ${{github.event_name == 'release' || env.IS_RC == 'true'}}
123+
if: ${{github.event_name == 'release' || env.IS_PRE == 'true'}}
124124
run: ./notarize.sh -i 30 -p "${APPLICATION_PWD}" "${DISTDIR}/${DMGNAME}"
125125
- name: Upload Artifact
126126
uses: actions/upload-artifact@v2

.github/workflows/installer-win.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ on:
2121

2222
push:
2323
tags:
24-
- v*rc*
24+
- v*pre*
2525

2626
concurrency:
2727
group: installer-win-${{ github.ref }}
@@ -30,7 +30,7 @@ concurrency:
3030
name: Create Windows Installer
3131

3232
env:
33-
IS_RC: ${{ github.event_name == 'push' && github.ref_type == 'tag' }}
33+
IS_PRE: ${{ github.event_name == 'push' && github.ref_type == 'tag' }}
3434

3535
jobs:
3636
build:

.github/workflows/installers-conda.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ on:
1919

2020
push:
2121
tags:
22-
- v*rc*
22+
- v*pre*
2323

2424
concurrency:
2525
group: installers-conda-${{ github.ref }}
@@ -28,7 +28,7 @@ concurrency:
2828
name: Create conda-based installers for Windows, macOS, and Linux
2929

3030
env:
31-
IS_RC: ${{ github.event_name == 'push' && github.ref_type == 'tag' }}
31+
IS_PRE: ${{ github.event_name == 'push' && github.ref_type == 'tag' }}
3232

3333
jobs:
3434
build-noarch-pkgs:
@@ -188,7 +188,7 @@ jobs:
188188
python build_conda_pkgs.py --build ${pkgs[@]}
189189
190190
- name: Create Keychain
191-
if: (github.event_name == 'release' || env.IS_RC == 'true') && runner.os == 'macOS'
191+
if: (github.event_name == 'release' || env.IS_PRE == 'true') && runner.os == 'macOS'
192192
run: |
193193
./certkeychain.sh "${MACOS_CERTIFICATE_PWD}" "${MACOS_CERTIFICATE}" "${MACOS_INSTALLER_CERTIFICATE}"
194194
CNAME=$(security find-identity -p codesigning -v | pcregrep -o1 "\(([0-9A-Z]+)\)")
@@ -226,7 +226,7 @@ jobs:
226226
fi
227227
228228
- name: Notarize package installer
229-
if: (github.event_name == 'release' || env.IS_RC == 'true') && runner.os == 'macOS'
229+
if: (github.event_name == 'release' || env.IS_PRE == 'true') && runner.os == 'macOS'
230230
run: ./notarize.sh -p $APPLICATION_PWD $PKG_FILE
231231

232232
- name: Upload Artifact

0 commit comments

Comments
 (0)