Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update CI to macos-13 #97

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
contents: read
security-events: write

runs-on: macos-11
runs-on: macos-latest
strategy:
fail-fast: false
matrix:
Expand Down
24 changes: 13 additions & 11 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ jobs:

tinyphone_osx_job:
name: Build Tinyphone macOS
runs-on: macos-11
runs-on: macos-13
steps:
- name: Checkout
uses: actions/checkout@v3
Expand All @@ -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 }}
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion tinyphone-osx/vendor/boost
Submodule boost updated 2 files
+2 −0 README.md
+215 −119 boost.sh
Loading