Compare commits

..

7 Commits

Author SHA1 Message Date
project516
9223da751d Update actions (#1280) 2026-05-08 16:34:09 -07:00
mahee96
e744ed8b67 0.6.4 tag marker 2026-05-05 13:09:20 +05:30
mahee96
20714673b2 - Fix: corrected device IP in vpn configuration screen + corrected altsign package to use master-branch 2026-05-05 12:15:45 +05:30
mahee96
7f2be4cd58 Merge branch 'develop' 2026-05-05 12:02:25 +05:30
nythepegasus
f055f33bec chore: bump to 0.6.4 [noci]
Signed-off-by: nythepegasus <mobile@nythepegas.us>
2026-05-05 00:49:16 -04:00
Magesh K
2b71c36ace Merge pull request #944 from SideStore/develop
Merge develop into main for 0.6.1 release
2025-04-08 22:03:54 -07:00
Zero King
4aca1dfa43 fix: typo in hasUpdate comparison
Signed-off-by: Zero King <l2dy@icloud.com>
2025-03-08 22:43:20 +05:30
8 changed files with 44 additions and 44 deletions

View File

@@ -20,7 +20,7 @@ jobs:
UPSTREAM_CHANNEL: "nightly"
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
submodules: recursive
fetch-depth: 0
@@ -54,13 +54,13 @@ jobs:
echo "MARKETING_VERSION=$NORMALIZED_VERSION" | tee -a $GITHUB_ENV
- name: Setup Xcode
uses: maxim-lobanov/setup-xcode@v1.6.0
uses: maxim-lobanov/setup-xcode@v1.7.0
with:
xcode-version: "26.2"
- name: Restore Cache (exact)
id: xcode-cache-exact
uses: actions/cache/restore@v3
uses: actions/cache/restore@v5
with:
path: |
~/Library/Developer/Xcode/DerivedData
@@ -70,7 +70,7 @@ jobs:
- name: Restore Cache (last)
if: steps.xcode-cache-exact.outputs.cache-hit != 'true'
id: xcode-cache-fallback
uses: actions/cache/restore@v3
uses: actions/cache/restore@v5
with:
path: |
~/Library/Developer/Xcode/DerivedData
@@ -119,7 +119,7 @@ jobs:
- name: Save Cache
if: ${{ steps.xcode-cache-fallback.outputs.cache-hit != 'true' }}
uses: actions/cache/save@v3
uses: actions/cache/save@v5
with:
path: |
~/Library/Developer/Xcode/DerivedData
@@ -141,12 +141,12 @@ jobs:
# --------------------------------------------------
# artifacts
# --------------------------------------------------
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v7
with:
name: build-logs-${{ env.MARKETING_VERSION }}.zip
path: build-logs.zip
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v7
if: >
vars.ENABLE_TESTS == '1' &&
vars.ENABLE_TESTS_BUILD == '1'
@@ -154,7 +154,7 @@ jobs:
name: tests-build-logs-${{ env.SHORT_COMMIT }}.zip
path: tests-build-logs.zip
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v7
if: >
vars.ENABLE_TESTS == '1' &&
vars.ENABLE_TESTS_RUN == '1'
@@ -166,12 +166,12 @@ jobs:
with:
name: SideStore-${{ env.MARKETING_VERSION }}.ipa
path: SideStore.ipa
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v7
with:
name: SideStore-${{ env.MARKETING_VERSION }}-dSYMs.zip
path: SideStore.dSYMs.zip
- uses: actions/checkout@v4
- uses: actions/checkout@v7
if: env.DEPLOY_KEY != ''
with:
repository: "SideStore/apps-v2.json"

View File

@@ -24,7 +24,7 @@ jobs:
if: github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success'
runs-on: ubuntu-latest
steps:
- uses: actions/github-script@v6
- uses: actions/github-script@v9
with:
# This snippet is public-domain, taken from
# https://github.com/oprypin/nightly.link/blob/master/.github/workflows/pr-comment.yml

View File

@@ -22,7 +22,7 @@ jobs:
UPSTREAM_CHANNEL: ""
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
submodules: recursive
fetch-depth: 0
@@ -78,14 +78,14 @@ jobs:
- name: Setup Xcode
if: steps.build_gate.outputs.should_skip != 'true'
uses: maxim-lobanov/setup-xcode@v1.6.0
uses: maxim-lobanov/setup-xcode@v1.7.0
with:
xcode-version: "26.4"
- name: Restore Cache (exact)
if: steps.build_gate.outputs.should_skip != 'true'
id: xcode-cache-exact
uses: actions/cache/restore@v3
uses: actions/cache/restore@v5
with:
path: |
~/Library/Developer/Xcode/DerivedData
@@ -97,7 +97,7 @@ jobs:
steps.build_gate.outputs.should_skip != 'true' &&
steps.xcode-cache-exact.outputs.cache-hit != 'true'
id: xcode-cache-fallback
uses: actions/cache/restore@v3
uses: actions/cache/restore@v5
with:
path: |
~/Library/Developer/Xcode/DerivedData
@@ -151,7 +151,7 @@ jobs:
if: >
steps.build_gate.outputs.should_skip != 'true' &&
steps.xcode-cache-fallback.outputs.cache-hit != 'true'
uses: actions/cache/save@v3
uses: actions/cache/save@v5
with:
path: |
~/Library/Developer/Xcode/DerivedData
@@ -174,13 +174,13 @@ jobs:
# --------------------------------------------------
# artifacts
# --------------------------------------------------
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v7
if: steps.build_gate.outputs.should_skip != 'true'
with:
name: build-logs-${{ env.MARKETING_VERSION }}.zip
path: build-logs.zip
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v7
if: >
steps.build_gate.outputs.should_skip != 'true' &&
vars.ENABLE_TESTS == '1' &&
@@ -189,7 +189,7 @@ jobs:
name: tests-build-logs-${{ env.SHORT_COMMIT }}.zip
path: tests-build-logs.zip
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v7
if: >
steps.build_gate.outputs.should_skip != 'true' &&
vars.ENABLE_TESTS == '1' &&
@@ -198,18 +198,18 @@ jobs:
name: tests-run-logs-${{ env.SHORT_COMMIT }}.zip
path: tests-run-logs.zip
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v7
if: steps.build_gate.outputs.should_skip != 'true'
with:
name: SideStore-${{ env.MARKETING_VERSION }}.ipa
path: SideStore.ipa
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v7
if: steps.build_gate.outputs.should_skip != 'true'
with:
name: SideStore-${{ env.MARKETING_VERSION }}-dSYMs.zip
path: SideStore.dSYMs.zip
- uses: actions/checkout@v4
- uses: actions/checkout@v6
if: steps.build_gate.outputs.should_skip != 'true' && env.DEPLOY_KEY != ''
with:
repository: "SideStore/apps-v2.json"

View File

@@ -16,7 +16,7 @@ jobs:
runs-on: macos-26
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
submodules: recursive
fetch-depth: 1 # shallow clone just for PR
@@ -33,13 +33,13 @@ jobs:
echo "MARKETING_VERSION=$NORMALIZED_VERSION" | tee -a $GITHUB_ENV
- name: Setup Xcode
uses: maxim-lobanov/setup-xcode@v1.6.0
uses: maxim-lobanov/setup-xcode@v1.7.0
with:
xcode-version: "26.2"
- name: Restore Cache (exact)
id: xcode-cache-exact
uses: actions/cache/restore@v3
uses: actions/cache/restore@v5
with:
path: |
~/Library/Developer/Xcode/DerivedData
@@ -49,7 +49,7 @@ jobs:
- name: Restore Cache (last)
if: steps.xcode-cache-exact.outputs.cache-hit != 'true'
id: xcode-cache-fallback
uses: actions/cache/restore@v3
uses: actions/cache/restore@v5
with:
path: |
~/Library/Developer/Xcode/DerivedData
@@ -67,24 +67,24 @@ jobs:
- name: Save Cache
if: ${{ steps.xcode-cache-fallback.outputs.cache-hit != 'true' }}
uses: actions/cache/save@v3
uses: actions/cache/save@v5
with:
path: |
~/Library/Developer/Xcode/DerivedData
~/Library/Caches/org.swift.swiftpm
key: xcode-build-cache-${{ github.ref_name }}-${{ github.sha }}
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v7
with:
name: build-logs-${{ env.MARKETING_VERSION }}.zip
path: build-logs.zip
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v7
with:
name: SideStore-${{ env.MARKETING_VERSION }}.ipa
path: SideStore-${{ env.MARKETING_VERSION }}.ipa
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v7
with:
name: SideStore-${{ env.MARKETING_VERSION }}-dSYMs.zip
path: SideStore.dSYMs.zip

View File

@@ -21,7 +21,7 @@ jobs:
UPSTREAM_CHANNEL: ""
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
submodules: recursive
fetch-depth: 0
@@ -50,13 +50,13 @@ jobs:
echo "SHORT_COMMIT=$SHORT_COMMIT" | tee -a $GITHUB_ENV
- name: Setup Xcode
uses: maxim-lobanov/setup-xcode@v1.6.0
uses: maxim-lobanov/setup-xcode@v1.7.0
with:
xcode-version: "26.0"
xcode-version: "26.4"
- name: Restore Cache (exact)
id: xcode-cache-exact
uses: actions/cache/restore@v3
uses: actions/cache/restore@v5
with:
path: |
~/Library/Developer/Xcode/DerivedData
@@ -66,7 +66,7 @@ jobs:
- name: Restore Cache (last)
if: steps.xcode-cache-exact.outputs.cache-hit != 'true'
id: xcode-cache-fallback
uses: actions/cache/restore@v3
uses: actions/cache/restore@v5
with:
path: |
~/Library/Developer/Xcode/DerivedData
@@ -84,24 +84,24 @@ jobs:
- name: Save Cache
if: ${{ steps.xcode-cache-fallback.outputs.cache-hit != 'true' }}
uses: actions/cache/save@v3
uses: actions/cache/save@v5
with:
path: |
~/Library/Developer/Xcode/DerivedData
~/Library/Caches/org.swift.swiftpm
key: xcode-build-cache-stable-${{ github.sha }}
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v7
with:
name: build-logs-${{ env.MARKETING_VERSION }}.zip
path: build-logs.zip
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v7
with:
name: SideStore-${{ env.MARKETING_VERSION }}.ipa
path: SideStore.ipa
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v7
with:
name: SideStore-${{ env.MARKETING_VERSION }}-dSYMs.zip
path: SideStore.dSYMs.zip

View File

@@ -2427,8 +2427,8 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/SideStore/AltSign";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 0.1.0;
branch = master;
kind = branch;
};
};
A82067C22D03E0DE00645C0D /* XCRemoteSwiftPackageReference "SemanticVersion" */ = {

View File

@@ -98,7 +98,7 @@ final class TunnelConfig: ObservableObject {
static let shared = TunnelConfig()
private static let defaultOverrideIP: String = {
if #available(iOS 26.4, *) { return "192.168.1.50" }
// if #available(iOS 26.4, *) { return "192.168.1.50" }
return "10.7.0.1"
}()

View File

@@ -1,8 +1,8 @@
// Configuration settings file format documentation can be found at:
// https://help.apple.com/xcode/#/dev745c5c974
MARKETING_VERSION = 0.6.3
CURRENT_PROJECT_VERSION = 0603
MARKETING_VERSION = 0.6.4
CURRENT_PROJECT_VERSION = 0604
// Vars to be overwritten by `CodeSigning.xcconfig` if exists
DEVELOPMENT_TEAM = S32Z3HMYVQ