Merge 154cb62 into 13da2e1

voiceip · Mar 18, 2024 · 224a589 · 224a589
2 parents 13da2e1 + 154cb62
commit 224a589
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 4 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -36,7 +36,11 @@ jobs:
         auth_header="$(git config --local --get http.https://github.com/.extraheader)"
         git submodule sync --recursive
         git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
-    
+
+    - name: Disable IPv6
+      shell: bash -l {0}
+      run: echo "DISABLE_IPV6=1" >> $GITHUB_ENV
+
     - name: Install Dependencies
       shell: bash
       run : |

diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
@@ -22,6 +22,9 @@ jobs:
       with:
         fetch-depth: '1'
         submodules: 'recursive'
+    - name: Disable IPv6
+      shell: bash -l {0}
+      run: echo "DISABLE_IPV6=1" >> $GITHUB_ENV
     - name: Login to GitHub Container Registry
       uses: docker/login-action@v1
       with:

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -20,7 +20,10 @@ jobs:
       with:
         fetch-depth: '1'
         submodules: 'recursive'
-
+    - name: Disable IPv6
+      shell: bash -l {0}
+      run: echo "DISABLE_IPV6=1" >> $GITHUB_ENV 
+
     - name: Restore Boost Cache
       uses: actions/cache@v3
       id: cache-boost
@@ -85,14 +88,17 @@ jobs:
       with:
         fetch-depth: '1'
         submodules: 'recursive'
-
+    - name: Disable IPv6
+      shell: bash -l {0}
+      run: echo "DISABLE_IPV6=1" >> $GITHUB_ENV 
     - name: Install the Apple certificate and provisioning profile
       env:
         BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
         P12_PASSWORD: ${{ secrets.P12_PASSWORD }}
         #BUILD_PROVISION_PROFILE_BASE64: ${{ secrets.BUILD_PROVISION_PROFILE_BASE64 }}
         KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
       run: |
+
         # create variables
         CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
         PP_PATH=$RUNNER_TEMP/build_pp.mobileprovision
@@ -180,7 +186,9 @@ jobs:
       with:
         fetch-depth: '1'
         submodules: 'recursive'
-
+    - name: Disable IPv6
+      shell: bash -l {0}
+      run: echo "DISABLE_IPV6=1" >> $GITHUB_ENV    
     - name: Install Dependencies
       shell: bash
       run : |

diff --git a/tinyphone-osx/Tinyphone.xcodeproj/project.pbxproj b/tinyphone-osx/Tinyphone.xcodeproj/project.pbxproj
@@ -607,6 +607,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = tinyphone/tinyphone.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = 25JQ655X97;
@@ -617,6 +618,7 @@
 					"HAVE_RES_NDESTROY=1",
 				);
 				INFOPLIST_FILE = tinyphone/Info.plist;
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
@@ -658,6 +660,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = tinyphone/tinyphone.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = 25JQ655X97;
@@ -667,6 +670,7 @@
 					"HAVE_RES_NDESTROY=1",
 				);
 				INFOPLIST_FILE = tinyphone/Info.plist;
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",