Skip to content

Commit

Permalink
Merge pull request #81 from project-porko/ci/#42-add-github-actions-t…
Browse files Browse the repository at this point in the history
…est-flow-with-submodule

ci: remove submodule branch type
  • Loading branch information
choi-ys committed Jun 3, 2024
2 parents ca6acfe + 6bc987b commit 95f139e
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 22 deletions.
21 changes: 5 additions & 16 deletions .github/workflows/test-reporter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ on:
pull_request:
branches: [ develop ] # TODO: main branch PR 시 추가

permissions:
contents: read
permissions: write-all

jobs:
test:
Expand All @@ -15,8 +14,8 @@ jobs:
- name: 🍀 checkout submodule
uses: actions/checkout@v3
with:
token: ${{ secrets.PRIVATE_REPO_ACCESS_TOKEN }}
submodule: recursive
token: ${{ secrets.SUBMODULE_TOKEN }}
submodules: true

- name: 🍀 set up JDK 17
uses: actions/setup-java@v3
Expand All @@ -27,18 +26,9 @@ jobs:
- name: 🍀 grant execute permission for gradlew
run: chmod +x gradlew

- name: 🍀 debug checkout
run: ls -al

- name: 🍀 debug submodule checkout
run: ls -al vault

- name: debug submodule properties copied
- name: 🍀 copy submodule properties
run: ./gradlew copyProperties

- name: debug submodule properties copied
run: ls -al porko-common/src/main/resources

- name: 🍀 test with gradle
run: ./gradlew --info test

Expand All @@ -54,5 +44,4 @@ jobs:
with:
report_paths: 'build/test-results/test/TEST-*.xml'

- name: 🍀 docker build
run: docker build -t porko-app-local .
# TODO : ECR login, push image to ECR, deploy to server instance
7 changes: 3 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
[submodule "vault"]
path = vault
url = https://github.com/project-porko/porko-properties
branch = develop
[submodule "porko-properties"]
path = porko-properties
url = https://github.com/project-porko/porko-properties.git
4 changes: 2 additions & 2 deletions porko-common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ dependencies {
tasks.register("copyProperties") {
doLast {
copy {
from("../vault/application")
from("../porko-properties/application")
into("src/main/resources")
}
copy {
from("../vault/docker")
from("../porko-properties/docker")
into("../")
}
}
Expand Down

0 comments on commit 95f139e

Please sign in to comment.