Skip to content

Commit

Permalink
Merge branch 'develop' into feature/#4-network-hyerjang
Browse files Browse the repository at this point in the history
  • Loading branch information
chansooo authored Jun 11, 2024
2 parents b019014 + f2eafcd commit 86ad29b
Show file tree
Hide file tree
Showing 10 changed files with 124 additions and 18 deletions.
18 changes: 18 additions & 0 deletions .github/ISSUE_TEMPLATE/🏄🏾-feature-template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
---
name: "\U0001F3C4\U0001F3FE Feature Template"
about: "Feature 개발 시 생성해주세요. \U0001F64F\U0001F3FB"
title: "[Feature] 기능 이름"
labels: ''
assignees: ''

---

## 어떤 기능인가요?
> 기능을 설명해주세요.
## 작업 내용
- [ ] TO-DO
- [ ] TO-DO
- [ ] TO-DO

## 참고할만한 사항(Optional)
19 changes: 19 additions & 0 deletions .github/ISSUE_TEMPLATE/🐛-bug-report-template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
name: "\U0001F41B Bug Report Template"
about: "Bug 발견 시에 작성해 주세요. \U0001F423"
title: "[BUG] 버그 내용(간단하게!)"
labels: ''
assignees: ''

---

## 어떤 버그인가요?
> 어떤 버그인지 간단하게 설명해주세요.
## 어떻게 재현할 수 있나요?
> 가능한 구체적으로 적어주세요.(사진도 좋아요!)
## 기대 결과
> 기존에 원하던 결과는 무엇인가요? (사진도 좋아요!)
## 참고할만한 사항(Optional)
32 changes: 28 additions & 4 deletions .github/workflows/pullRequest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ jobs:
runs-on: macos-13
steps:
- uses: actions/checkout@v3

# - uses: maxim-lobanov/setup-xcode@v1
# with:
# xcode-version: '15.4'

- name: Access Available
run: chmod +x Scripts/onboarding.sh
Expand All @@ -35,5 +31,33 @@ jobs:
run: mise exec -- tuist install

- name: Build and Test
id: build_and_test
shell: bash -l {0}
run: mise exec -- tuist test PPACIOS-Workspace

notify-success:
name: Notify Discord on Success
runs-on: ubuntu-latest
needs: build
if: success()
steps:
- name: Notify Discord
env:
DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
uses: Ilshidur/action-discord@master
with:
args: "✅ PR Build Tests passed for \nPR: ${{ github.event.pull_request.title }}. \nPR URL: ${{ github.event.pull_request.html_url }}"

notify-failure:
name: Notify Discord on Failure
runs-on: ubuntu-latest
needs: build
if: failure()
steps:
- name: Notify Discord
env:
DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
uses: Ilshidur/action-discord@master
with:
args: "❌ PR Build Tests failed for \nPR: ${{ github.event.pull_request.title }}.\nPR URL: ${{ github.event.pull_request.html_url }}"

14 changes: 2 additions & 12 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,7 @@ USER_NAME = $(shell python3 Scripts/author_name.py)
CURRENT_DATE = $(shell pipenv run python Scripts/current_date.py)

bootstrap:
@curl https://mise.run | sh
@echo 'eval "$(~/.local/bin/mise activate zsh)"' >> ~/.zshrc
@echo 'export PATH="$HOME/.local/share/mise/shims:$PATH"' >> ~/.zprofile
@source ~/.zshrc
@arch -arm64 brew install pipenv
@arch -arm64 brew install fastlane
@fastlane match development --readonly
@fastlane match appstore --readonly
@mise install
@tuist install
@tuist generate
@./Scripts/bootstrap.sh

# e.g. make core name=모듈이름
core:
Expand All @@ -34,4 +24,4 @@ feature:
--author "$(USER_NAME)" \
--current-date "$(CURRENT_DATE)"

@tuist edit
@tuist edit
3 changes: 1 addition & 2 deletions Matchfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ storage_mode("git")

type("development") # The default type, can be: appstore, adhoc, enterprise or development

# app_identifier(["tools.fastlane.app", "tools.fastlane.app2"])
# username("[email protected]") # Your Apple Developer Portal username
app_identifier(["ppac.farmeme.App"])

# For all available options run `fastlane match --help`
# Remove the # in the beginning of the line to enable the other options
Expand Down
26 changes: 26 additions & 0 deletions Projects/Core/PPACUtil/Project.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
//
// Project.swift
// PPACUtil
//
// Created by kimchansoo on 2024/06/09
//

import ProjectDescription
import ProjectDescriptionHelpers

let project = Project(
name: "PPACUtil",
targets: [
.configure(
name: "PPACUtil",
product: .framework,
infoPlist: .default,
sources: "Sources/**",
resources: "Resources/**",
dependencies: [

]
)
]
)

1 change: 1 addition & 0 deletions Projects/Core/PPACUtil/Resources/dummy.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
더미임미다
1 change: 1 addition & 0 deletions Projects/Core/PPACUtil/Sources/dummy.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
더미임미다
27 changes: 27 additions & 0 deletions Scripts/bootstrap.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#!/bin/zsh

set -e

# mise 설치
curl https://mise.run | sh

# 환경설정 추가
echo 'eval "$(~/.local/bin/mise activate zsh)"' >> ~/.zshrc
echo 'export PATH="$HOME/.local/share/mise/shims:$PATH"' >> ~/.zprofile

# zsh 다시 시작
exec zsh

# 필요한 도구 설치
arch -arm64 brew install pipenv fastlane

# fastlane 설정
fastlane match development --readonly
fastlane match appstore --readonly

# mise, tuist 설치
mise install
tuist install

# tuist generate 실행
tuist generate
1 change: 1 addition & 0 deletions Tuist/ProjectDescriptionHelpers/TargetDependency+.swift
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ extension TargetDependency {
public static let DesignSystem = project(moduleName: "DesignSystem")
public static let PPACModels = project(moduleName: "PPACModels")
public static let PPACNetwork = project(moduleName: "PPACNetwork")
public static let PPACUtil = project(moduleName: "PPACUtil")
}

public struct ThirdParty {
Expand Down

0 comments on commit 86ad29b

Please sign in to comment.