diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index eabb364e..bfbc7cdd 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -15,11 +15,11 @@ on: push: branches: [ enhancement/ci ] paths-ignore: - - 'README.md' - - 'SECURITY.md' - - '.gitmodules' - - '.gitignore' - - 'LICENSE' + - 'README.md' + - 'SECURITY.md' + - '.gitmodules' + - '.gitignore' + - 'LICENSE' schedule: - cron: '44 20 * * 1' @@ -41,107 +41,105 @@ jobs: # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed steps: - - uses: maxim-lobanov/setup-xcode@v1 - with: - xcode-version: '12.4' + - uses: maxim-lobanov/setup-xcode@v1 + with: + xcode-version: '12.4' - - name: Checkout repository - uses: actions/checkout@v2 - with: - submodules: true + - name: Checkout repository + uses: actions/checkout@v2 + with: + submodules: true - - name: Change Version - run: | - sudo chmod +x resources/version.sh && ./resources/version.sh || true - git remote show origin + - name: Change Version + run: sudo chmod +x resources/version.sh && ./resources/version.sh || true - # Initializes the CodeQL tools for scanning. -# - name: Initialize CodeQL -# uses: github/codeql-action/init@v1 -# with: -# languages: ${{ matrix.language }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. + # Initializes the CodeQL tools for scanning. + # - name: Initialize CodeQL + # uses: github/codeql-action/init@v1 + # with: + # languages: ${{ matrix.language }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. # queries: ./path/to/local/query, your-org/your-repo/queries@main - # â„šī¸ Command-line programs to run using the OS shell. - # 📚 https://git.io/JvXDl + # â„šī¸ Command-line programs to run using the OS shell. + # 📚 https://git.io/JvXDl - # âœī¸ If the Autobuild fails above, remove it and uncomment the following three lines - # and modify them (or add more) to build your code if your project - # uses a compiled language + # âœī¸ If the Autobuild fails above, remove it and uncomment the following three lines + # and modify them (or add more) to build your code if your project + # uses a compiled language -# - name : env -# run: | -# export EVS_ACCOUNT_NAME=${{ secrets.EVS_ACCOUNT_NAME}} && export EVS_PASSWD=${{ secrets.EVS_PASSWD }} -# export CSC_LINK=${{ secrets.CSC_LINK }} && export CSC_KEY_PASSWORD=${{ secrets.CSC_KEY_PASSWORD }} -# export APPLEID=${{ secrets.APPLEID }} && export APPLEIDPASS=${{ secrets.APPLEIDPASS }} + # - name : env + # run: | + # export EVS_ACCOUNT_NAME=${{ secrets.EVS_ACCOUNT_NAME}} && export EVS_PASSWD=${{ secrets.EVS_PASSWD }} + # export CSC_LINK=${{ secrets.CSC_LINK }} && export CSC_KEY_PASSWORD=${{ secrets.CSC_KEY_PASSWORD }} + # export APPLEID=${{ secrets.APPLEID }} && export APPLEIDPASS=${{ secrets.APPLEIDPASS }} - - name: Sign in to EVS - run: | - python3 -m pip install --upgrade castlabs-evs - python3 -m castlabs_evs.account refresh -A ${{ secrets.EVS_ACCOUNT_NAME }} -P ${{ secrets.EVS_PASSWD }} + - name: Sign in to EVS + run: | + python3 -m pip install --upgrade castlabs-evs + python3 -m castlabs_evs.account refresh -A ${{ secrets.EVS_ACCOUNT_NAME }} -P ${{ secrets.EVS_PASSWD }} - - name : Build - env: - CSC_LINK: ${{ secrets.CSC_LINK }} - CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }} - APPLEID: ${{ secrets.APPLEID }} - APPLEIDPASS: ${{ secrets.APPLEIDPASS }} - APPLE_ID: ${{ secrets.APPLEID }} - APPLE_ID_PASSWORD: ${{ secrets.APPLEIDPASS }} - PSC_NAME: ${{ secrets.PSC_NAME }} - DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer - run: | - rm cider-yarn.lock || true - xcodebuild -version - brew install autoconf automake libtool - yarn install - cp resources/verror-types node_modules/@types/verror/index.d.ts - cp resources/macPackager.js node_modules/app-builder-lib/out/macPackager.js - rm -r node_modules/pouchdb-node/node_modules/leveldown - rm -r node_modules/pouchdb-adapter-leveldb/node_modules/leveldown - rm -r /node_modules/leveldown/node_modules/node-gyp-build || true - yarn dist:universalNotWorking -p never - ls -# - name: Perform CodeQL Analysis -# uses: github/codeql-action/analyze@v1 + - name: Build + env: + CSC_LINK: ${{ secrets.CSC_LINK }} + CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }} + APPLEID: ${{ secrets.APPLEID }} + APPLEIDPASS: ${{ secrets.APPLEIDPASS }} + APPLE_ID: ${{ secrets.APPLEID }} + APPLE_ID_PASSWORD: ${{ secrets.APPLEIDPASS }} + PSC_NAME: ${{ secrets.PSC_NAME }} + DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer + run: | + rm cider-yarn.lock || true + xcodebuild -version + brew install autoconf automake libtool + yarn install + cp resources/verror-types node_modules/@types/verror/index.d.ts + cp resources/macPackager.js node_modules/app-builder-lib/out/macPackager.js + rm -r node_modules/pouchdb-node/node_modules/leveldown + rm -r node_modules/pouchdb-adapter-leveldb/node_modules/leveldown + rm -r /node_modules/leveldown/node_modules/node-gyp-build || true + yarn dist:universalNotWorking -p never + ls + # - name: Perform CodeQL Analysis + # uses: github/codeql-action/analyze@v1 - - name: Add license to dmg - run: | - npx dmg-license resources/license.json dist/*.dmg + - name: Add license to dmg + run: | + npx dmg-license resources/license.json dist/*.dmg - - name: Import - uses: apple-actions/import-codesign-certs@v1 - with: - p12-file-base64: ${{ secrets.CSC_LINK }} - p12-password: ${{ secrets.CSC_KEY_PASSWORD }} + - name: Import + uses: apple-actions/import-codesign-certs@v1 + with: + p12-file-base64: ${{ secrets.CSC_LINK }} + p12-password: ${{ secrets.CSC_KEY_PASSWORD }} - # Makes the PKG - - name: Create PKG manually - env: - CSC_LINK: ${{ secrets.CSC_LINK }} - CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }} - APPLEID: ${{ secrets.APPLEID }} - APPLEIDPASS: ${{ secrets.APPLEIDPASS }} - run: | - pkgbuild --component dist/mac-universal/Cider.app --install-location /Applications dist/Cider.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 }} - sleep 5m - xcrun stapler staple dist/Cider.pkg || true - mv dist/*.dmg dist/Cider.dmg + # Makes the PKG + - name: Create PKG manually + env: + CSC_LINK: ${{ secrets.CSC_LINK }} + CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }} + APPLEID: ${{ secrets.APPLEID }} + APPLEIDPASS: ${{ secrets.APPLEIDPASS }} + run: | + pkgbuild --component dist/mac-universal/Cider.app --install-location /Applications dist/Cider.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 }} + sleep 5m + xcrun stapler staple dist/Cider.pkg || true + mv dist/*.dmg dist/Cider.dmg - - name: Upload a Build Artifact - uses: actions/upload-artifact@v2.2.3 - with: - # Artifact name - name: macOS - # A file, directory or wildcard pattern that describes what to upload - path: | - dist/*.dmg - dist/*.pkg - # The desired behavior if no files are found using the provided path. + - name: Upload a Build Artifact + uses: actions/upload-artifact@v2.2.3 + with: + # Artifact name + name: macOS + # A file, directory or wildcard pattern that describes what to upload + path: | + dist/*.dmg + dist/*.pkg + # The desired behavior if no files are found using the provided path. # - name: Release # uses: softprops/action-gh-release@v1 diff --git a/resources/version.sh b/resources/version.sh index 915f3bd2..2d36c60b 100755 --- a/resources/version.sh +++ b/resources/version.sh @@ -1,6 +1,10 @@ #!/bin/bash # DEBUGGING +curl -s https://api.github.com/repos/ciderapp/Cider/branches/stable + +# | grep sha | cut -d '"' -f 4 | sed 's/v//' | xargs | cut -d' ' -f1 | head -n 1 + 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 | head -n 1) echo $LATEST_SHA COMMITSINCESTABLE=$(git rev-list $LATEST_SHA..HEAD --count) @@ -8,7 +12,6 @@ echo $COMMITSINCESTABLE CURRENT_VERSION=$(node -p -e "require('./package.json').version") echo $CURRENT_VERSION -git log $LATEST_SHA #############################################################################################