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

Here we go again

Browse source
This commit is contained in:
Core 2022-08-01 14:29:20 +01:00
parent c501a8ddb1
commit c07ae6972e
No known key found for this signature in database
GPG key ID: FE9BF1B547F8F3C6
2 changed files with 42 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -13,7 +13,7 @@ name: "macOS build"
on: on:
push: push:
branches: [ main ] branches: [ enhancement/macosBuilds ]
paths-ignore: paths-ignore:
- 'README.md' - 'README.md'
- 'SECURITY.md' - 'SECURITY.md'
@ -24,7 +24,7 @@ on:
- cron: '44 20 * * 1' - cron: '44 20 * * 1'
jobs: jobs:
analyze: build-macos:
name: macOS build name: macOS build
runs-on: macos-11 runs-on: macos-11
permissions: permissions:
@ -99,6 +99,7 @@ jobs:
rm -r node_modules/pouchdb-adapter-leveldb/node_modules/leveldown rm -r node_modules/pouchdb-adapter-leveldb/node_modules/leveldown
rm -r /node_modules/leveldown/node_modules/node-gyp-build || true rm -r /node_modules/leveldown/node_modules/node-gyp-build || true
yarn dist:universalNotWorking -p never yarn dist:universalNotWorking -p never
ls
# - name: Perform CodeQL Analysis # - name: Perform CodeQL Analysis
# uses: github/codeql-action/analyze@v1 # uses: github/codeql-action/analyze@v1
@ -112,6 +113,7 @@ jobs:
p12-file-base64: ${{ secrets.CSC_LINK }} p12-file-base64: ${{ secrets.CSC_LINK }}
p12-password: ${{ secrets.CSC_KEY_PASSWORD }} p12-password: ${{ secrets.CSC_KEY_PASSWORD }}
# Makes the PKG
- name: Create PKG manually - name: Create PKG manually
env: env:
CSC_LINK: ${{ secrets.CSC_LINK }} CSC_LINK: ${{ secrets.CSC_LINK }}

21
resources/version.sh
View file

@ -1,10 +1,19 @@
#!/bin/bash #!/bin/bash
LATEST_SHA=$(curl -s https://api.github.com/repos/ciderapp/Cider/branches/stable | grep '"sha"' | head -1 | cut -d '"' -f 4) printenv
SHA_DATE=$(git show -s --format=%ci $LATEST_SHA) # DEBUGGING
COMMITSINCESTABLE=$(git rev-list $LATEST_SHA..HEAD --count --since="$SHA_DATE") LATEST_SHA=$(curl -s https://api.github.com/repos/ciderapp/Cider/branches/stable | grep sha | cut -d '"' -f 4 | sed 's/v//' | xargs | cut -d' ' -f1)
echo $LATEST_SHA
COMMITSINCESTABLE=$(git rev-list $LATEST_SHA..HEAD --count)
echo $COMMITSINCESTABLE
CURRENT_VERSION=$(node -p -e "require('./package.json').version") CURRENT_VERSION=$(node -p -e "require('./package.json').version")
if [[ $CIRCLE_BRANCH == "main" && $COMMITSINCESTABLE -gt 0 ]]; then echo $CURRENT_VERSION
GITHUB_BASE_REF="main"
echo $GITHUB_BASE_REF
#############################################################################################
if [[ ($CIRCLE_BRANCH == "main" || $GITHUB_BASE_REF == "main") && $COMMITSINCESTABLE -gt 0 ]]; then
NEW_VERSION="${CURRENT_VERSION}-beta.${COMMITSINCESTABLE}" NEW_VERSION="${CURRENT_VERSION}-beta.${COMMITSINCESTABLE}"
else else
NEW_VERSION=${CURRENT_VERSION/0/$COMMITSINCESTABLE} NEW_VERSION=${CURRENT_VERSION/0/$COMMITSINCESTABLE}
@ -17,4 +26,8 @@ else
echo "Version unchanged, commits since stable is ${COMMITSINCESTABLE}" echo "Version unchanged, commits since stable is ${COMMITSINCESTABLE}"
fi fi
if [[ -z "${GITHUB_ENV}" ]]; then
echo "APP_VERSION=$(node -p -e 'require("./package.json").version')" >>$GITHUB_ENV
elif [[ -z "${BASH_ENV}" ]]; then
echo "export APP_VERSION=$(node -p -e 'require("./package.json").version')" >>$BASH_ENV echo "export APP_VERSION=$(node -p -e 'require("./package.json").version')" >>$BASH_ENV
fi