Compare commits

..

1 Commits

Author SHA1 Message Date
Max Goedjen
d76600c3ad Merge. 2024-01-15 14:40:42 -08:00
7 changed files with 22 additions and 1039 deletions

View File

@@ -5,8 +5,8 @@ on:
- cron: "0 8 * * *" - cron: "0 8 * * *"
jobs: jobs:
build: build:
# runs-on: macOS-latest-xlarge # runs-on: macOS-latest
runs-on: macos-13-xlarge runs-on: macos-13
timeout-minutes: 10 timeout-minutes: 10
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@@ -20,7 +20,7 @@ jobs:
APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }} APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }}
run: ./.github/scripts/signing.sh run: ./.github/scripts/signing.sh
- name: Set Environment - name: Set Environment
run: sudo xcrun xcode-select -s /Applications/Xcode_15.2.app run: sudo xcrun xcode-select -s /Applications/Xcode_15.1.app
- name: Update Build Number - name: Update Build Number
env: env:
RUN_ID: ${{ github.run_id }} RUN_ID: ${{ github.run_id }}

View File

@@ -6,8 +6,8 @@ on:
- '*' - '*'
jobs: jobs:
test: test:
# runs-on: macOS-latest-xlarge # runs-on: macOS-latest
runs-on: macos-13-xlarge runs-on: macos-13
timeout-minutes: 10 timeout-minutes: 10
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@@ -21,7 +21,7 @@ jobs:
APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }} APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }}
run: ./.github/scripts/signing.sh run: ./.github/scripts/signing.sh
- name: Set Environment - name: Set Environment
run: sudo xcrun xcode-select -s /Applications/Xcode_15.2.app run: sudo xcrun xcode-select -s /Applications/Xcode_15.1.app
- name: Test - name: Test
run: | run: |
pushd Sources/Packages pushd Sources/Packages
@@ -43,7 +43,7 @@ jobs:
APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }} APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }}
run: ./.github/scripts/signing.sh run: ./.github/scripts/signing.sh
- name: Set Environment - name: Set Environment
run: sudo xcrun xcode-select -s /Applications/Xcode_15.2.app run: sudo xcrun xcode-select -s /Applications/Xcode_15.1.app
- name: Update Build Number - name: Update Build Number
env: env:
TAG_NAME: ${{ github.ref }} TAG_NAME: ${{ github.ref }}

View File

@@ -3,13 +3,13 @@ name: Test
on: [push, pull_request] on: [push, pull_request]
jobs: jobs:
test: test:
# runs-on: macOS-latest-xlarge # runs-on: macOS-latest
runs-on: macos-13-xlarge runs-on: macos-13
timeout-minutes: 10 timeout-minutes: 10
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Set Environment - name: Set Environment
run: sudo xcrun xcode-select -s /Applications/Xcode_15.2.app run: sudo xcrun xcode-select -s /Applications/Xcode_15.1.app
- name: Test - name: Test
run: | run: |
pushd Sources/Packages pushd Sources/Packages

View File

@@ -429,10 +429,7 @@
knownRegions = ( knownRegions = (
en, en,
Base, Base,
it,
fr, fr,
de,
"pt-BR",
); );
mainGroup = 50617D7623FCE48D0099B055; mainGroup = 50617D7623FCE48D0099B055;
productRefGroup = 50617D8023FCE48E0099B055 /* Products */; productRefGroup = 50617D8023FCE48E0099B055 /* Products */;

File diff suppressed because it is too large Load Diff

View File

@@ -26,7 +26,7 @@ struct SetupView: View {
} }
} }
} }
.frame(minWidth: 500, idealWidth: 500, minHeight: 500, idealHeight: 500) .frame(idealWidth: 500, idealHeight: 500)
} }

View File

@@ -42,16 +42,16 @@ struct UpdateDetailView<UpdaterType: Updater>: View {
if let prefix = split.first { if let prefix = split.first {
switch prefix { switch prefix {
case "#": case "#":
attributed = Text(unprefixed).font(.title) + Text(verbatim: "\n") attributed = Text(unprefixed).font(.title) + Text("\n")
case "##": case "##":
attributed = Text(unprefixed).font(.title2) + Text(verbatim: "\n") attributed = Text(unprefixed).font(.title2) + Text("\n")
case "###": case "###":
attributed = Text(unprefixed).font(.title3) + Text(verbatim: "\n") attributed = Text(unprefixed).font(.title3) + Text("\n")
default: default:
attributed = Text(line) + Text(verbatim: "\n\n") attributed = Text(line) + Text("\n\n")
} }
} else { } else {
attributed = Text(line) + Text(verbatim: "\n\n") attributed = Text(line) + Text("\n\n")
} }
text = text + attributed text = text + attributed
} }