Skip to content

Commit

Permalink
Wk debug signing (#1193)
Browse files Browse the repository at this point in the history
* find error that was with previous build

* Fixed bug where verse marker was not added after editing chapter. (#1190)

The issue here is that we are checking based on the label and not the formatted label. The label for chapter maker 2 and verse marker 2 is just "2", however, the formatted label is "chapter-marker-2" and "verse-marker-2"

* Protect setting recordedVerses (#1192)

* Protect setting recordedVerses

A crash seems to be connected to a concurrent modification issue

Also clean up in undock

* Update AudioWorkspaceView.kt

* feature: add macos signing + notarization.  Upgrade install4j version. Change secretes management in build (#1191)

* Update VERSION

* finish rebase dev adn debug signing

---------

Co-authored-by: Darrell Cole Hill <darrellcolehill@gmail.com>
Co-authored-by: Joe <jsarabia1247@gmail.com>
  • Loading branch information
3 people authored Nov 8, 2024
1 parent 9b4d98a commit f7c78bc
Showing 1 changed file with 6 additions and 9 deletions.
15 changes: 6 additions & 9 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ jobs:
set-env-vars:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: FranzDiebold/github-env-vars-action@v2.1.0
- name: Parse SemVer if tagged build
id: semver_parser
Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:
runs-on: ubuntu-20.04
needs: set-env-vars
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set Build Secrets
uses: 1password/load-secrets-action@v2
with:
Expand All @@ -62,17 +62,14 @@ jobs:
INSTALL4J_LICENSE_11: "op://DevOps/Orature_CI_CD/INSTALL4J_LICENSE"
MAC_KEYSTORE_PW: "op://DevOps/Orature_CI_CD/MAC-P12-SIGNING-PASSWORD"
ORG_GRADLE_PROJECT_githubOauthToken: "op://DevOps/Orature_CI_CD/CRASH_REPORTS_OAUTH_TOKEN"
ORG_GRADLE_PROJECT_sentryDsn: "op://DevOps/Orature_CI_CD/SENTRY_TOKEN"
ORG_GRADLE_PROJECT_sentryDsn: "op://DevOps/Orature_CI_CD/SENTRY_OTTER_DSN"
SONAR_TOKEN: "op://DevOps/Orature_CI_CD/SONAR_TOKEN"
MAC_NOTARY_ISSUER: "op://DevOps/Orature_CI_CD/MAC_NOTARY_ISSUER"
MAC_NOTARY_KEY_ID: "op://DevOps/Orature_CI_CD/MAC_NOTARY_KEY_ID"
- name: Write mac secrets for i4j
shell: bash
run: |
echo -n $MAC_SIGNING_KEY_BASE64 | base64 -d > $HOME/signing_macos.p12 && echo -n $MAC_APP_STORE_NOTARY_API_KEY > $HOME/mac_app_notary_key.p8
env:
MAC_SIGNING_KEY_BASE64: ${{ env.MAC_SIGNING_KEY_BASE64 }}
MAC_APP_STORE_NOTARY_API_KEY: ${{ env.MAC_APP_STORE_NOTARY_API_KEY }}
- name: install4j build
shell: bash
run: |
Expand All @@ -91,7 +88,7 @@ jobs:
-e MAC_NOTARY_ISSUER \
-e MAC_NOTARY_KEY_ID \
wycliffeassociates/install4j-docker:11.0 \
./gradlew build :jvm:workbookapp:install4jdeploy "-Dorg.gradle.jvmargs=-Xmx2048m -Dnet.bytebuddy.experimental=true -XX:MaxMetaspaceSize=1024m"
./gradlew build :jvm:workbookapp:install4jdeploy "-Dorg.gradle.jvmargs=-Xmx4096m -Dnet.bytebuddy.experimental=true -XX:MaxMetaspaceSize=1024m"
env:
UPDATE_PATH: ${{ needs.set-env-vars.outputs.UPDATE_PATH }}
ORG_GRADLE_PROJECT_gradlewCommandVersionProp: ${{ needs.set-env-vars.outputs.GHA_VERSION }}
Expand All @@ -112,7 +109,7 @@ jobs:
echo "NOTARIZATION_LOG=$NOTARIZATION_LOG" >> $GITHUB_ENV
- name: Write notarization log to artifact
if: ${{ failure() }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: notarization-log
path: ${{ env.NOTARIZATION_LOG }}
Expand All @@ -129,7 +126,7 @@ jobs:
needs: [build]
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- uses: FranzDiebold/github-env-vars-action@v2.1.0

- name: Setup .NET Core SDK
Expand Down

0 comments on commit f7c78bc

Please sign in to comment.