Skip to content

Commit

Permalink
Merge pull request #617 from wakmusic/615-solve-needle-conflit
Browse files Browse the repository at this point in the history
🔀 :: (#615) 니들관련 컨플릭트를 해결해요
  • Loading branch information
yongbeomkwak authored Jun 17, 2024
2 parents bebc20d + c3d9e8b commit 1e648b8
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 3 deletions.
8 changes: 7 additions & 1 deletion .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
outputs:
package_dependency_cache_key: ${{ steps.compute_package_hash.outputs.package_hash }}
carthage_dependency_cache_key: ${{ steps.compute_carthage_hash.outputs.carthage_hash }}

test:
name: 🧪 Test
runs-on: macos-14
Expand Down Expand Up @@ -103,6 +103,9 @@ jobs:
path: ${{ env.CACHED_CARTHAGE_DEPENDENCY_PATHS }}
key: ${{ needs.prepare-ci.outputs.carthage_dependency_cache_key }}

- name: Install needle
run: brew install needle

- name: Install dependencies needs
if: steps.cache_package_dependencies.outputs.cache-hit != 'true' || steps.cache_carthage_dependencies.outputs.cache-hit != 'true'
run: make install
Expand All @@ -118,5 +121,8 @@ jobs:
touch ${{ env.GOOGLE_SERVICE_INFO_PLIST_PATH }}
echo "${{ secrets.GOOGLE_INFO_PLIST }}" > ${{ env.GOOGLE_SERVICE_INFO_PLIST_PATH }}
- name: Generate NeedleGenerated.swift
run: sh Scripts/NeedleRunScript.sh

- name: Test with tuist
run: make test
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -111,3 +111,6 @@ amplifytools.xcconfig

### Google
GoogleService-Info.plist

### Needle
Projects/App/Sources/Application/NeedleGenerated.swift
6 changes: 4 additions & 2 deletions Scripts/NeedleRunScript.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ fi
export PATH

if which needle > /dev/null; then
needle generate Sources/Application/NeedleGenerated.swift ../
ROOT_PATH="Projects/App"
touch "${ROOT_PATH}/Sources/Application/NeedleGenerated.swift"
needle generate ${ROOT_PATH}/Sources/Application/NeedleGenerated.swift ../
else
echo "warning: Needle not installed, plz run 'brew install needle'"
fi
fi

0 comments on commit 1e648b8

Please sign in to comment.