Skip to content

Commit

Permalink
Merge branch 'iOS/dev' into iOS/feat#7
Browse files Browse the repository at this point in the history
  • Loading branch information
anyukyung committed Nov 14, 2023
2 parents 4bf29b9 + 2e6cb92 commit 4bd5c52
Show file tree
Hide file tree
Showing 22 changed files with 825 additions and 73 deletions.
14 changes: 14 additions & 0 deletions .github/ISSUE_TEMPLATE/🐞-bug-template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
name: "\U0001F41E Bug Template"
about: Create a report to help us improve
title: 'bug: ...'
labels: bug
assignees: ''

---

## 🐞 버그 설명
스크린 샷, 작동 환경 (OS, device 등)을 적어주세요.

## 📝 todo
- [ ] todo !
14 changes: 14 additions & 0 deletions .github/ISSUE_TEMPLATE/💡-issue-template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
name: "\U0001F4A1 Issue Template"
about: Suggest an idea for this project
title: 'feat: ...'
labels: feature
assignees: ''

---

## 💡 issue
이슈에 대한 내용을 설명해주세요.

## 📝 todo
- [ ] todo !
21 changes: 21 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
## 🧑‍🚀 PR 요약
해당 pr에서 작업한 내역을 적어주세요.

#### 📌 변경 사항
변경사항 및 주의 사항 (모듈 설치 등)을 적어주세요.

##### 📸 ScreenShot
작동, 구현화면

##### ✅ PR check list
```
- commit message가 적절한지 확인해주세요.
- 마지막으로 Coding Convention을 준수했는지 확인해주세요.
- 적절한 branch로 요청했는지 확인해주세요.
- Assignees, Label을 붙여주세요.
- 가능한 이슈를 Link 해주세요.
- PR이 승인된 경우 해당 브랜치는 삭제해주세요.
```

#### Linked Issue
close #
66 changes: 66 additions & 0 deletions .github/workflows/ios-pr-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
name: iOS PR test workflow

on:
pull_request:
branches: [ "iOS/dev" ]
workflow_dispatch:
inputs:
logLevel:
description: 'Log level'
required: true
default: 'warning'
type: choice
options:
- info
- warning
- debug
print_tags:
description: 'True to print to STDOUT'
required: true
type: boolean
tags:
description: 'Test scenario tags'
required: true
type: string
environment:
description: 'Environment to run tests against'
type: environment
required: true

jobs:
build:
name: Build and Test default scheme using any available iPhone simulator
runs-on: macos-latest

steps:
- name: Checkout
uses: actions/checkout@v3
- name: Set Default Scheme
run: |
cd iOS/Layover
scheme_list=$(xcodebuild -list -json | tr -d "\n")
default=$(echo $scheme_list | ruby -e "require 'json'; puts JSON.parse(STDIN.gets)['project']['targets'][0]")
echo $default | cat >default
echo Using default scheme: $default
- name: Build
env:
scheme: ${{ 'default' }}
platform: ${{ 'iOS Simulator' }}
run: |
# xcrun xctrace returns via stderr, not the expected stdout (see https://developer.apple.com/forums/thread/663959)
device=`xcrun xctrace list devices 2>&1 | grep -oE 'iPhone.*?[^\(]+' | head -1 | awk '{$1=$1;print}' | sed -e "s/ Simulator$//"`
if [ $scheme = default ]; then scheme=$(cat default); fi
if [ "`ls -A | grep -i \\.xcworkspace\$`" ]; then filetype_parameter="workspace" && file_to_build="`ls -A | grep -i \\.xcworkspace\$`"; else filetype_parameter="project" && file_to_build="`ls -A | grep -i \\.xcodeproj\$`"; fi
file_to_build=`echo $file_to_build | awk '{$1=$1;print}'`
xcodebuild build-for-testing -scheme "$scheme" -"$filetype_parameter" "$file_to_build" -destination "platform=$platform,name=$device"
- name: Test
env:
scheme: ${{ 'default' }}
platform: ${{ 'iOS Simulator' }}
run: |
# xcrun xctrace returns via stderr, not the expected stdout (see https://developer.apple.com/forums/thread/663959)
device=`xcrun xctrace list devices 2>&1 | grep -oE 'iPhone.*?[^\(]+' | head -1 | awk '{$1=$1;print}' | sed -e "s/ Simulator$//"`
if [ $scheme = default ]; then scheme=$(cat default); fi
if [ "`ls -A | grep -i \\.xcworkspace\$`" ]; then filetype_parameter="workspace" && file_to_build="`ls -A | grep -i \\.xcworkspace\$`"; else filetype_parameter="project" && file_to_build="`ls -A | grep -i \\.xcodeproj\$`"; fi
file_to_build=`echo $file_to_build | awk '{$1=$1;print}'`
xcodebuild test-without-building -scheme "$scheme" -"$filetype_parameter" "$file_to_build" -destination "platform=$platform,name=$device"
12 changes: 9 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</thead>
<tbody>
<tr>
<td><img width="200" src="https://avatars.githubusercontent.com/u/46420281?v=4" /> </td>
<td><img width="200" src="https://github.com/boostcampwm2023/iOS09-Layover/assets/46420281/3b3d1134-79f6-4b04-8ad3-78ffbc56dec9" /> </td>
<td><img width="200" src="https://avatars.githubusercontent.com/u/70168249?v=4" /></td>
<td><img width="200" src="https://avatars.githubusercontent.com/u/44396392?v=4" /></td>
<td><img width="200" src="https://avatars.githubusercontent.com/u/111403658?v=4" /></td>
Expand All @@ -37,7 +37,7 @@
<tr>
<td width="200"><b>Write Reasonable Code!</b><br/>이유 있는 코드를 작성하기</td>
<td width="200"><b>🏊‍♂️ DEEP DIVE</b><br/>함께 성장하기<br/>재밌게 하기<br/>꼼꼼한 코드리뷰<br/></td>
<td width="200">열심히 하기!</td>
<td width="200"><b>🐢 기본에 충실한</b><br/>서드 파티에 의존하지 않기<br/>Swift를 이용한 기술 도전 많이 하기</td>
<td width="200">과정을 즐기기</br>열린 자세로 학습</td>
<td width="200">영향을 주는 사람 되기 🎱</td>
</tr>
Expand All @@ -46,6 +46,12 @@

---

![Layover표지](https://github.com/boostcampwm2023/iOS09-Layover/assets/44396392/11befbb5-46af-4e24-b8e9-cb1378239f74)

![기획 설명](https://github.com/boostcampwm2023/iOS09-Layover/assets/44396392/0a7c7d57-c513-4dda-8d1a-4396cfaf802d)

---

## 협업 전략
### git flow 전략 🎃
- 그룹화로 `BE``iOS` 브랜치 구분
Expand All @@ -57,7 +63,7 @@
- `BE`/dev
- `BE`/feat

<img src="https://nvie.com/img/[email protected]">
![깃 플로우](https://github.com/boostcampwm2023/iOS09-Layover/assets/44396392/6ab7693e-52ee-4df2-8b22-ef60dd962ac9)

---

Expand Down
Loading

0 comments on commit 4bd5c52

Please sign in to comment.