From 5b12215ba7015a75f285299ca40a3ff1752a68f9 Mon Sep 17 00:00:00 2001 From: Kinshuk Bairagi Date: Fri, 3 Jan 2025 11:50:20 +0530 Subject: [PATCH 1/6] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e1e9700..28dea10 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -81,7 +81,7 @@ jobs: tinyphone_osx_job: name: Build Tinyphone macOS - runs-on: macos-11 + runs-on: macos-12 steps: - name: Checkout uses: actions/checkout@v3 From 58d1cfcb5761d6908c6a80ba0346c255139d1266 Mon Sep 17 00:00:00 2001 From: Kinshuk Bairagi Date: Fri, 3 Jan 2025 11:51:23 +0530 Subject: [PATCH 2/6] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 28dea10..d6bee8c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -81,7 +81,7 @@ jobs: tinyphone_osx_job: name: Build Tinyphone macOS - runs-on: macos-12 + runs-on: macos-13 steps: - name: Checkout uses: actions/checkout@v3 From 6306150d61f0692fca27ab6a9deedc2b17af3fe3 Mon Sep 17 00:00:00 2001 From: Kinshuk Bairagi Date: Fri, 3 Jan 2025 11:51:35 +0530 Subject: [PATCH 3/6] Update codeql-analysis.yml --- .github/workflows/codeql-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index c8ca671..a8543fa 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -17,7 +17,7 @@ jobs: contents: read security-events: write - runs-on: macos-11 + runs-on: macos-latest strategy: fail-fast: false matrix: From 23537a19494c57932f5aedadb662412bec80c6f7 Mon Sep 17 00:00:00 2001 From: Kinshuk Bairagi Date: Fri, 3 Jan 2025 12:00:00 +0530 Subject: [PATCH 4/6] Update main.yml --- .github/workflows/main.yml | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d6bee8c..ca3619d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -91,6 +91,17 @@ jobs: - name: Disable IPv6 shell: bash -l {0} run: echo "DISABLE_IPV6=1" >> $GITHUB_ENV + + - name: Install Dependencies + shell: bash + run : | + export HOMEBREW_NO_INSTALL_CLEANUP=true + brew install autoconf automake libtool tree wget opencore-amr + # wget https://gist.githubusercontent.com/kingster/1954ead3c38a40cac88c5c1311bb39c5/raw/343da2c7a2a52ee5a1c03902cc5e44ed83b1dd5d/cryptopp.rb + # brew install --build-from-source -f cryptopp.rb + brew install cryptopp + npm install -g appdmg + - name: Install the Apple certificate and provisioning profile env: BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }} @@ -105,7 +116,7 @@ jobs: KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db # import certificate and provisioning profile from secrets - echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode --output $CERTIFICATE_PATH + echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode -o $CERTIFICATE_PATH #echo -n "$BUILD_PROVISION_PROFILE_BASE64" | base64 --decode --output $PP_PATH # create temporary keychain @@ -124,15 +135,6 @@ jobs: mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles #cp $PP_PATH ~/Library/MobileDevice/Provisioning\ Profiles - - name: Install Dependencies - shell: bash - run : | - export HOMEBREW_NO_INSTALL_CLEANUP=true - brew install autoconf automake libtool tree wget opencore-amr - wget https://gist.githubusercontent.com/kingster/1954ead3c38a40cac88c5c1311bb39c5/raw/343da2c7a2a52ee5a1c03902cc5e44ed83b1dd5d/cryptopp.rb - brew install --build-from-source -f cryptopp.rb - npm install -g appdmg - - name: Compile Libraries run : | #xcode needs to be proper at this point From b288f3ef0f9fdeea3ab596d3274a37ac11a4b897 Mon Sep 17 00:00:00 2001 From: Kinshuk Bairagi Date: Fri, 3 Jan 2025 12:04:14 +0530 Subject: [PATCH 5/6] Update boost --- tinyphone-osx/vendor/boost | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tinyphone-osx/vendor/boost b/tinyphone-osx/vendor/boost index c1fd07d..d65ad8a 160000 --- a/tinyphone-osx/vendor/boost +++ b/tinyphone-osx/vendor/boost @@ -1 +1 @@ -Subproject commit c1fd07de22e8597c9bc57ba1290d7652faae874f +Subproject commit d65ad8abfa1b2c4a438aa957ab926080ec6d487e From c838678e9a481dbcd49a2de9fc1d5dbb226c9a6b Mon Sep 17 00:00:00 2001 From: Kinshuk Bairagi Date: Fri, 3 Jan 2025 12:09:59 +0530 Subject: [PATCH 6/6] update boost url --- .gitmodules | 2 +- tinyphone-osx/vendor/boost | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 2401547..2750936 100644 --- a/.gitmodules +++ b/.gitmodules @@ -33,7 +33,7 @@ url = https://github.com/voiceip/statsd-cpp.git [submodule "tinyphone-osx/vendor/boost"] path = tinyphone-osx/vendor/boost - url = https://github.com/faithfracture/Apple-Boost-BuildScript.git + url = https://github.com/mathieugarcia/Apple-Boost-BuildScript.git [submodule "lib/spdlog"] path = lib/spdlog url = https://github.com/gabime/spdlog.git diff --git a/tinyphone-osx/vendor/boost b/tinyphone-osx/vendor/boost index d65ad8a..38e233c 160000 --- a/tinyphone-osx/vendor/boost +++ b/tinyphone-osx/vendor/boost @@ -1 +1 @@ -Subproject commit d65ad8abfa1b2c4a438aa957ab926080ec6d487e +Subproject commit 38e233cdb2e873d8b1eea25a1606e7722d18d44c