Skip to content

Commit 4508ae5

Browse files
austincondiffaustincondiff
authored
Merge branch 'CodeEditApp:main' into main
2 parents 7527f29 + a9a321a commit 4508ae5

File tree

135 files changed

+2630
-1424
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

135 files changed

+2630
-1424
lines changed

‎.github/workflows/CI-bump-build-number.yml‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,22 @@ jobs:
77
runs-on: [self-hosted, macOS]
88
steps:
99
- name: Checkout repository
10-
uses: actions/checkout@v2
10+
uses: actions/checkout@v3
1111

1212
- name: Bump Build Number
1313
run: |
1414
xcrun agvtool next-version -all
15+
APP_BUILD=$(xcrun agvtool vers -terse)
16+
echo "APP_BUILD=$APP_BUILD" >> $GITHUB_ENV
1517
1618
- name: Commit Changes
19+
env:
20+
APP_BUILD: ${{ env.APP_BUILD }}
1721
run: |
1822
git add .
1923
git config --local user.email "action@github.com"
2024
git config --local user.name "GitHub Action"
21-
git commit -m "bump build number"
25+
git commit -m "bump build number to $APP_BUILD"
2226
- name: Push Changes
2327
uses: ad-m/github-push-action@v0.6.0
2428
with:
@@ -27,9 +31,11 @@ jobs:
2731
force: true
2832
- name: Create Pull Request
2933
uses: peter-evans/create-pull-request@v4
34+
env:
35+
APP_BUILD: ${{ env.APP_BUILD }}
3036
with:
3137
branch: temp/bump-build-number
3238
delete-branch: true
3339
base: main
34-
title: Bump Build Number
35-
body: Automatically bump build number of all targets
40+
title: Bump Build Number to ${{ env.APP_BUILD }}
41+
body: Automatically bump build number of all targets to ${{ env.APP_BUILD }}

‎.github/workflows/appcast.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ name: Build and publish a new appcast file
22

33
on:
44
workflow_dispatch:
5-
release:
65

76
jobs:
87
jekyll:

‎.github/workflows/lint.yml‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,6 @@ jobs:
88
SwiftLint:
99
runs-on: [self-hosted, macOS] # ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v1
11+
- uses: actions/checkout@v3
1212
- name: GitHub Action for SwiftLint
1313
run: swiftlint --strict
14-
15-
# Old version using `ubuntu-latest`
16-
# - name: Remove TODOs
17-
# run: exec ./.github/scripts/remove_todos.sh
18-
# - name: GitHub Action for SwiftLint
19-
# uses: norio-nomura/action-swiftlint@3.2.1
20-
# - name: GitHub Action for SwiftLint with --strict
21-
# uses: norio-nomura/action-swiftlint@3.2.1
22-
# with:
23-
# args: --strict
24-
# - name: GitHub Action for SwiftLint (Only files changed in the PR)
25-
# uses: norio-nomura/action-swiftlint@3.2.1
26-
# env:
27-
# DIFF_BASE: ${{ github.base_ref }}
28-
# - name: GitHub Action for SwiftLint (Different working directory)
29-
# uses: norio-nomura/action-swiftlint@3.2.1
30-
# env:
31-
# WORKING_DIRECTORY: Source

‎.github/workflows/pre-release.yml‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: [self-hosted, macOS]
1111
steps:
1212
- name: Checkout repository
13-
uses: actions/checkout@v2
13+
uses: actions/checkout@v3
1414

1515
############################
1616
# Install Certificate
@@ -48,7 +48,7 @@ jobs:
4848
- name: Build CodeEdit
4949
env:
5050
APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
51-
run: xcodebuild -scheme CodeEdit -configuration Release -derivedDataPath "$RUNNER_TEMP/DerivedData" -archivePath "$RUNNER_TEMP/CodeEdit.xcarchive" -skipPackagePluginValidation DEVELOPMENT_TEAM=$APPLE_TEAM_ID archive
51+
run: xcodebuild -scheme CodeEdit -configuration Alpha -derivedDataPath "$RUNNER_TEMP/DerivedData" -archivePath "$RUNNER_TEMP/CodeEdit.xcarchive" -skipPackagePluginValidation DEVELOPMENT_TEAM=$APPLE_TEAM_ID archive
5252

5353
############################
5454
# Sign
@@ -89,6 +89,16 @@ jobs:
8989
"$RUNNER_TEMP/CodeEdit-$REV.dmg" \
9090
"$RUNNER_TEMP/CodeEdit.xcarchive/Products/Applications/"
9191
security lock-keychain
92+
93+
############################
94+
# Get Version and Build number
95+
############################
96+
- name: Get Version and Build number
97+
run: |
98+
APP_VERSION=$(xcrun agvtool mvers -terse1)
99+
APP_BUILD=$(xcrun agvtool vers -terse)
100+
echo "APP_VERSION=$APP_VERSION" >> $GITHUB_ENV
101+
echo "APP_BUILD=$APP_BUILD" >> $GITHUB_ENV
92102
93103
############################
94104
# Sparkle Appcast
@@ -99,28 +109,21 @@ jobs:
99109
# SPARKLE_CHANNEL: Seperate dev builds from default channel, to be specified in [SPUUpdaterDelegate allowedChannelsForUpdater:]
100110
# SPARKLE_DL_PREFIX: Prefix for the URL from where updates will be downloaded
101111
# SPARKLE_LINK: CodeEdit Website
112+
# https://github.com/CodeEditApp/CodeEdit/releases/download/0.0.1-alpha.11/CodeEdit-9113dc5.dmg
102113
SPARKLE_KEY: ${{ secrets.SPARKLE_KEY }}
103114
SPARKLE_CHANNEL: dev
104-
SPARKLE_DL_PREFIX: "https://github.com/CodeEditApp/CodeEdit/releases/download/latest/"
115+
SPARKLE_DL_PREFIX: "https://github.com/CodeEditApp/CodeEdit/releases/download"
105116
SPARKLE_LINK: "https://github.com/CodeEditApp/CodeEdit"
117+
APP_VERSION: ${{ env.APP_VERSION }}
118+
APP_BUILD: ${{ env.APP_BUILD }}
106119
run: |
107120
SPARKLE_BIN="$RUNNER_TEMP/DerivedData/SourcePackages/artifacts/sparkle/bin"
108121
SPARKLE_ARCHIVE="$RUNNER_TEMP/Sparkle_Archive"
109122
echo -n "$SPARKLE_KEY" | tee "$RUNNER_TEMP/sparkle_key"
110123
mkdir "$SPARKLE_ARCHIVE"
111124
cp "$RUNNER_TEMP/CodeEdit-$REV.dmg" "$SPARKLE_ARCHIVE"
112125
SPARKLE_SIG=$("$SPARKLE_BIN/sign_update" --ed-key-file "$RUNNER_TEMP/sparkle_key" "$SPARKLE_ARCHIVE/CodeEdit-$REV.dmg" | cut -d\" -f2)
113-
"$SPARKLE_BIN/generate_appcast" --ed-key-file "$RUNNER_TEMP/sparkle_key" --download-url-prefix "$SPARKLE_DL_PREFIX" --link "$SPARKLE_LINK" --channel "$SPARKLE_CHANNEL" --maximum-deltas 0 "$SPARKLE_ARCHIVE"
114-
115-
############################
116-
# Get Version and Build number
117-
############################
118-
- name: Get Version and Build number
119-
run: |
120-
APP_VERSION=$(xcrun agvtool mvers -terse1)
121-
APP_BUILD=$(xcrun agvtool vers -terse)
122-
echo "APP_VERSION=$APP_VERSION" >> $GITHUB_ENV
123-
echo "APP_BUILD=$APP_BUILD" >> $GITHUB_ENV
126+
"$SPARKLE_BIN/generate_appcast" --ed-key-file "$RUNNER_TEMP/sparkle_key" --download-url-prefix "${{ env.SPARKLE_DL_PREFIX }}/${{ env.APP_VERSION }}-alpha.${{ env.APP_BUILD }}/" --link "$SPARKLE_LINK" --channel "$SPARKLE_CHANNEL" --maximum-deltas 0 "$SPARKLE_ARCHIVE"
124127
125128
############################
126129
# Publish Pre Release

‎.github/workflows/tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ jobs:
88
runs-on: [self-hosted, macOS]
99
steps:
1010
- name: Checkout repository
11-
uses: actions/checkout@v1
11+
uses: actions/checkout@v3
1212
- name: Testing App
1313
run: exec ./.github/scripts/test_app.sh arm

‎.swiftlint.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ opt_in_rules:
2525
- modifier_order
2626
- convenience_type
2727
- pattern_matching_keywords
28+
- multiline_parameters_brackets
29+
- multiline_arguments_brackets
2830

2931
custom_rules:
3032
spaces_over_tabs:

0 commit comments

Comments
 (0)