okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed cron, renamed some steps, debugging version.sh

Browse source
This commit is contained in:
Core 2022-08-03 18:31:13 +01:00
parent 69df95f74a
commit 9949ba87cd
No known key found for this signature in database
GPG key ID: FE9BF1B547F8F3C6
2 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
.github/workflows/build-macos.yml vendored
View file

@ -9,12 +9,11 @@ on:
- '.gitmodules' - '.gitmodules'
- '.gitignore' - '.gitignore'
- 'LICENSE' - 'LICENSE'
schedule: - 'cider.lock'
- cron: '44 20 * * 1'
jobs: jobs:
build-macos: build-macos:
name: macOS build name: build-macos
runs-on: macos-11 runs-on: macos-11
permissions: permissions:
actions: read actions: read
@ -44,11 +43,9 @@ jobs:
python3 -m castlabs_evs.account refresh -A ${{ secrets.EVS_ACCOUNT_NAME }} -P ${{ secrets.EVS_PASSWD }} python3 -m castlabs_evs.account refresh -A ${{ secrets.EVS_ACCOUNT_NAME }} -P ${{ secrets.EVS_PASSWD }}
- name: Setup Environment - name: Setup Environment
run: | run: brew install autoconf automake libtool
xcodebuild -version
brew install autoconf automake libtool
- name: Install Node Modules - name: Install and Configure Node Modules
run: | run: |
yarn install yarn install
cp resources/verror-types node_modules/@types/verror/index.d.ts cp resources/verror-types node_modules/@types/verror/index.d.ts
@ -72,8 +69,7 @@ jobs:
run: yarn dist:universalNotWorking -p never run: yarn dist:universalNotWorking -p never
- name: Add license to DMG - name: Add license to DMG
run: | run: npx dmg-license resources/license.json dist/*.dmg
npx dmg-license resources/license.json dist/*.dmg
- name: Import - name: Import
uses: apple-actions/import-codesign-certs@v1 uses: apple-actions/import-codesign-certs@v1
@ -89,7 +85,7 @@ jobs:
APPLEID: ${{ secrets.APPLEID }} APPLEID: ${{ secrets.APPLEID }}
APPLEIDPASS: ${{ secrets.APPLEIDPASS }} APPLEIDPASS: ${{ secrets.APPLEIDPASS }}
run: | run: |
pkgbuild --component dist/mac-universal/Cider.app --install-location /Applications dist/Cider-$APP_VERSION-universal.pkg --sign ${{ secrets.PSC_NAME }} pkgbuild --component dist/mac-universal/Cider.app --install-location /Applications dist/Cider-${{ env.APP_VERSION }}-universal.pkg --sign ${{ secrets.PSC_NAME }}
xcrun altool --notarize-app --primary-bundle-id com.ciderapp.cider -f dist/Cider*.pkg --username ${{ secrets.APPLEID }} --password ${{ secrets.APPLEIDPASS }} xcrun altool --notarize-app --primary-bundle-id com.ciderapp.cider -f dist/Cider*.pkg --username ${{ secrets.APPLEID }} --password ${{ secrets.APPLEIDPASS }}
sleep 5m sleep 5m
xcrun stapler staple dist/Cider*.pkg || true xcrun stapler staple dist/Cider*.pkg || true
@ -97,7 +93,7 @@ jobs:
- name: Upload a Build Artifact - name: Upload a Build Artifact
uses: actions/upload-artifact@v2.2.3 uses: actions/upload-artifact@v2.2.3
with: with:
name: Cider-macOS-$APP_VERSION name: Cider-macOS-${{ env.APP_VERSION }}
path: dist/* path: dist/*
# - name: Upload Artifacts to Latest Release # - name: Upload Artifacts to Latest Release

2
resources/version.sh
View file

@ -5,6 +5,8 @@ SHA_DATE=$(git show -s --format=%ci $STABLE_SHA)
COMMITSINCESTABLE=$(git rev-list $STABLE_SHA..HEAD --count --since="$SHA_DATE") COMMITSINCESTABLE=$(git rev-list $STABLE_SHA..HEAD --count --since="$SHA_DATE")
CURRENT_VERSION=$(node -p -e "require('./package.json').version") CURRENT_VERSION=$(node -p -e "require('./package.json').version")
echo "Commits since stable: $COMMITSINCESTABLE"
# Make the version number # Make the version number
if [[ $CIRCLE_BRANCH == "stable" || $GITHUB_REF_NAME == "stable" ]]; then if [[ $CIRCLE_BRANCH == "stable" || $GITHUB_REF_NAME == "stable" ]]; then
echo "This is a stable branch. Setting stable version." echo "This is a stable branch. Setting stable version."