Skip to content

Commit 0230093

Browse files
ShapeKim98ShapeKim98
authored
Merge pull request #162 from YAPP-Github/develop
release 1.0.4
2 parents ea53630 + b437b25 commit 0230093

File tree

165 files changed

+4294
-2627
lines changed

Some content is hidden

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

165 files changed

+4294
-2627
lines changed

.github/workflows/hotfix.yml renamed to .github/workflows/appstore_release.yml

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
# This workflow will build a Swift project
22
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-swift
33

4-
name: hotfix
4+
name: appstore-release
55

66
on:
7-
push:
8-
branches: [ "hotfix/*" ]
7+
pull_request:
8+
branches:
9+
- main
910

1011
jobs:
1112
build:
@@ -17,12 +18,12 @@ jobs:
1718
- name: Set up Xcode
1819
uses: maxim-lobanov/setup-xcode@v1
1920
with:
20-
xcode-version: '15.4'
21+
xcode-version: latest-stable
2122

22-
# - uses: shimataro/ssh-key-action@v2
23-
# with:
24-
# key: ${{ secrets.SSH_KEY }}
25-
# known_hosts: ${{ secrets.KNOWN_HOSTS }}
23+
- uses: shimataro/ssh-key-action@v2
24+
with:
25+
key: ${{ secrets.SSH_KEY }}
26+
known_hosts: ${{ secrets.KNOWN_HOSTS }}
2627

2728
- name: initial mise
2829
run: |
@@ -36,10 +37,10 @@ jobs:
3637
- name: Generate Project
3738
env:
3839
MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
39-
MATCH_URL: ${{ secrets.MATCH_URL }}
40-
APP_STORE_CONNECT_TEAM_ID: ${{ secrets.APP_STORE_CONNECT_TEAM_ID }}
4140
DEVELOPMENT_TEAM: ${{ secrets.DEVELOPMENT_TEAM }}
42-
run: fastlane generate
41+
run: |
42+
fastlane appstore_profile
43+
make release
4344
4445
- name: Build Archive
4546
env:
@@ -48,9 +49,9 @@ jobs:
4849
APP_STORE_CONNECT_API: ${{ secrets.APP_STORE_CONNECT_API }}
4950
run: fastlane archive
5051

51-
- name: Beta Release
52+
- name: Appstore Release
5253
env:
5354
APP_STORE_CONNECT_KEY_ID: ${{ secrets.APP_STORE_CONNECT_KEY_ID }}
5455
APP_STORE_CONNECT_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_ISSUER_ID }}
5556
APP_STORE_CONNECT_API: ${{ secrets.APP_STORE_CONNECT_API }}
56-
run: fastlane release
57+
run: fastlane appstore_release

β€Ž.github/workflows/build_test.ymlβ€Ž

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@ name: build-test
55

66
on:
77
pull_request:
8-
branches: [ "develop" ]
8+
branches:
9+
- develop
10+
11+
workflow_dispatch:
912

1013
jobs:
1114
build:
@@ -17,7 +20,7 @@ jobs:
1720
- name: Set up Xcode
1821
uses: maxim-lobanov/setup-xcode@v1
1922
with:
20-
xcode-version: '15.4'
23+
xcode-version: latest-stable
2124

2225
- uses: shimataro/ssh-key-action@v2
2326
with:
@@ -36,10 +39,10 @@ jobs:
3639
- name: Test Generate
3740
env:
3841
MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
39-
MATCH_URL: ${{ secrets.MATCH_URL }}
40-
APP_STORE_CONNECT_TEAM_ID: ${{ secrets.APP_STORE_CONNECT_TEAM_ID }}
4142
DEVELOPMENT_TEAM: ${{ secrets.DEVELOPMENT_TEAM }}
42-
run: fastlane test
43+
run: |
44+
fastlane development_profile
45+
make test
4346
4447
- name: Build Test
4548
run: fastlane build

.github/workflows/workflow_test.yml renamed to .github/workflows/develop_hotfix.yml

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
# This workflow will build a Swift project
22
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-swift
33

4-
name: workflow_test
4+
name: develop-hotfix
55

66
on:
77
push:
8-
branches: [ "workflow/*" ]
8+
branches: [ "develop" ]
9+
10+
workflow_dispatch:
911

1012
jobs:
1113
build:
14+
if: startsWith(github.event.head_commit.message, '[hotfix]')
1215
runs-on: macos-latest
1316

1417
steps:
@@ -17,12 +20,12 @@ jobs:
1720
- name: Set up Xcode
1821
uses: maxim-lobanov/setup-xcode@v1
1922
with:
20-
xcode-version: '15.4'
23+
xcode-version: latest-stable
2124

22-
# - uses: shimataro/ssh-key-action@v2
23-
# with:
24-
# key: ${{ secrets.SSH_KEY }}
25-
# known_hosts: ${{ secrets.KNOWN_HOSTS }}
25+
- uses: shimataro/ssh-key-action@v2
26+
with:
27+
key: ${{ secrets.SSH_KEY }}
28+
known_hosts: ${{ secrets.KNOWN_HOSTS }}
2629

2730
- name: initial mise
2831
run: |
@@ -33,24 +36,13 @@ jobs:
3336
- name: initial tuist
3437
run: mise install tuist
3538

36-
- name: Test Generate
37-
env:
38-
MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
39-
MATCH_URL: ${{ secrets.MATCH_URL }}
40-
APP_STORE_CONNECT_TEAM_ID: ${{ secrets.APP_STORE_CONNECT_TEAM_ID }}
41-
DEVELOPMENT_TEAM: ${{ secrets.DEVELOPMENT_TEAM }}
42-
run: fastlane test
43-
44-
- name: Build Test
45-
run: fastlane build
46-
47-
- name: Release Generate
39+
- name: Generate Project
4840
env:
4941
MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
50-
MATCH_URL: ${{ secrets.MATCH_URL }}
51-
APP_STORE_CONNECT_TEAM_ID: ${{ secrets.APP_STORE_CONNECT_TEAM_ID }}
5242
DEVELOPMENT_TEAM: ${{ secrets.DEVELOPMENT_TEAM }}
53-
run: fastlane generate
43+
run: |
44+
fastlane appstore_profile
45+
make release
5446
5547
- name: Build Archive
5648
env:
@@ -59,9 +51,9 @@ jobs:
5951
APP_STORE_CONNECT_API: ${{ secrets.APP_STORE_CONNECT_API }}
6052
run: fastlane archive
6153

62-
- name: Beta Release
54+
- name: Testflight Release
6355
env:
6456
APP_STORE_CONNECT_KEY_ID: ${{ secrets.APP_STORE_CONNECT_KEY_ID }}
6557
APP_STORE_CONNECT_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_ISSUER_ID }}
6658
APP_STORE_CONNECT_API: ${{ secrets.APP_STORE_CONNECT_API }}
67-
run: fastlane release
59+
run: fastlane testflight_release

β€Ž.github/workflows/release_update.ymlβ€Ž

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# This workflow will build a Swift project
2+
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-swift
3+
4+
name: release-update
5+
6+
on:
7+
pull_request:
8+
branches:
9+
- main
10+
types:
11+
- closed
12+
13+
jobs:
14+
release-update:
15+
if: ${{ github.event.pull_request.merged == true }}
16+
runs-on: macos-latest
17+
18+
steps:
19+
- uses: actions/checkout@v4
20+
21+
- name: Install GitHub CLI
22+
run: sudo apt-get install gh
23+
24+
- name: Update Release
25+
env:
26+
APP_STORE_CONNECT_KEY_ID: ${{ secrets.APP_STORE_CONNECT_KEY_ID }}
27+
APP_STORE_CONNECT_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_ISSUER_ID }}
28+
APP_STORE_CONNECT_API: ${{ secrets.APP_STORE_CONNECT_API }}
29+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
30+
PR_NUMBER: ${{ github.event.pull_request.number }}
31+
run: fastlane update_github_release

β€Ž.github/workflows/testflight_release.ymlβ€Ž

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,20 @@
11
# This workflow will build a Swift project
22
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-swift
33

4-
name: testflight_release
4+
name: testflight-release
55

66
on:
7-
push:
8-
branches: [ "develop" ]
7+
pull_request:
8+
branches:
9+
- develop
10+
types:
11+
- closed
12+
13+
workflow_dispatch:
914

1015
jobs:
1116
build:
17+
if: ${{ github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true }}
1218
runs-on: macos-latest
1319

1420
steps:
@@ -17,7 +23,7 @@ jobs:
1723
- name: Set up Xcode
1824
uses: maxim-lobanov/setup-xcode@v1
1925
with:
20-
xcode-version: '15.4'
26+
xcode-version: latest-stable
2127

2228
- uses: shimataro/ssh-key-action@v2
2329
with:
@@ -36,10 +42,10 @@ jobs:
3642
- name: Generate Project
3743
env:
3844
MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
39-
MATCH_URL: ${{ secrets.MATCH_URL }}
40-
APP_STORE_CONNECT_TEAM_ID: ${{ secrets.APP_STORE_CONNECT_TEAM_ID }}
4145
DEVELOPMENT_TEAM: ${{ secrets.DEVELOPMENT_TEAM }}
42-
run: fastlane generate
46+
run: |
47+
fastlane appstore_profile
48+
make release
4349
4450
- name: Build Archive
4551
env:
@@ -48,9 +54,9 @@ jobs:
4854
APP_STORE_CONNECT_API: ${{ secrets.APP_STORE_CONNECT_API }}
4955
run: fastlane archive
5056

51-
- name: Beta Release
57+
- name: Testflight Release
5258
env:
5359
APP_STORE_CONNECT_KEY_ID: ${{ secrets.APP_STORE_CONNECT_KEY_ID }}
5460
APP_STORE_CONNECT_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_ISSUER_ID }}
5561
APP_STORE_CONNECT_API: ${{ secrets.APP_STORE_CONNECT_API }}
56-
run: fastlane release
62+
run: fastlane testflight_release

β€ŽMakefileβ€Ž

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,17 @@ download-privates:
5252
@if [ ! -d "Pokit_iOS_Private" ]; then \
5353
git clone [email protected]:stealmh/Pokit_iOS_Private.git; \
5454
fi
55-
@if [ -f "Pokit_iOS_Private/xcconfig/Secret.xcconfig" ]; then \
55+
@if [ -f "Pokit_iOS_Private/xcconfig/Debug.xcconfig" ] && [ -f "Pokit_iOS_Private/xcconfig/Release.xcconfig" ]; then \
5656
mkdir -p xcconfig; \
57-
cp Pokit_iOS_Private/xcconfig/Secret.xcconfig xcconfig/Secret.xcconfig; \
57+
cp Pokit_iOS_Private/xcconfig/Debug.xcconfig xcconfig/Debug.xcconfig; \
58+
cp Pokit_iOS_Private/xcconfig/Release.xcconfig xcconfig/Release.xcconfig; \
59+
cp Pokit_iOS_Private/xcconfig/Debug-Share.xcconfig xcconfig/Debug-Share.xcconfig; \
60+
cp Pokit_iOS_Private/xcconfig/Release-Share.xcconfig xcconfig/Release-Share.xcconfig; \
5861
cp Pokit_iOS_Private/auth/AuthKey.p8 Projects/CoreKit/Resources/AuthKey.p8; \
5962
cp Pokit_iOS_Private/GoogleService-Info.plist Projects/App/Resources/GoogleService-Info.plist; \
63+
cp Pokit_iOS_Private/GoogleService-Info.plist Projects/App/ShareExtension/Resources/GoogleService-Info.plist; \
6064
rm -rf Pokit_iOS_Private; \
61-
echo "βœ… Secret νŒŒμΌμ„ μ„±κ³΅μ μœΌλ‘œ λ‹€μš΄λ‘œλ“œν•˜κ³  Pokit_iOS_Private 폴더λ₯Ό μ‚­μ œν–ˆμŠ΅λ‹ˆλ‹€."; \
65+
echo "βœ… Debug.xcconfig와 Release.xcconfig νŒŒμΌμ„ μ„±κ³΅μ μœΌλ‘œ λ‹€μš΄λ‘œλ“œν•˜κ³  Pokit_iOS_Private 폴더λ₯Ό μ‚­μ œν–ˆμŠ΅λ‹ˆλ‹€."; \
6266
else \
63-
echo "❌ Secret.xcconfig νŒŒμΌμ„ 찾을 수 μ—†μŠ΅λ‹ˆλ‹€."; \
67+
echo "❌ Debug.xcconfig λ˜λŠ” Release.xcconfig νŒŒμΌμ„ 찾을 수 μ—†μŠ΅λ‹ˆλ‹€." && exit 1; \
6468
fi

β€ŽProjects/App/AppTests/Resources/info.plistβ€Ž

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>ENABLE_TESTING_SEARCH_PATHS</key>
6+
<string>YES</string>
7+
</dict>
8+
</plist>

β€ŽProjects/App/AppTests/Sources/AppTests.swiftβ€Ž

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import ComposableArchitecture
2+
import XCTest
3+
4+
@testable import App
5+
6+
final class AppTests: XCTestCase {
7+
func test() {
8+
9+
}
10+
}

0 commit comments

Comments
Β (0)