From cca5087f302a64b76ca35845325c1fdc6009c9ad Mon Sep 17 00:00:00 2001 From: ikseong00 <127182222+ikseong00@users.noreply.github.com> Date: Sat, 16 Nov 2024 15:18:49 +0900 Subject: [PATCH 1/4] =?UTF-8?q?ci=20test=20=EC=9A=A9=20=EC=98=A4=EB=A5=98?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/example/ourmenuv2/MainActivity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/example/ourmenuv2/MainActivity.kt b/app/src/main/java/com/example/ourmenuv2/MainActivity.kt index 1e5a94a..88406cf 100644 --- a/app/src/main/java/com/example/ourmenuv2/MainActivity.kt +++ b/app/src/main/java/com/example/ourmenuv2/MainActivity.kt @@ -15,7 +15,7 @@ import com.example.ourmenuv2.ui.theme.OurMenuV2Theme class MainActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContent { + setContent {ㄴㅇㄹ OurMenuV2Theme { // A surface container using the 'background' color from the theme Surface( From 6731e68d7a39d5660846989fa9326f0c32ecc244 Mon Sep 17 00:00:00 2001 From: ikseong00 <127182222+ikseong00@users.noreply.github.com> Date: Sat, 16 Nov 2024 17:31:43 +0900 Subject: [PATCH 2/4] ci update --- .github/workflow/android.yml | 45 ++++++++++++++++++++++++++++-------- 1 file changed, 36 insertions(+), 9 deletions(-) diff --git a/.github/workflow/android.yml b/.github/workflow/android.yml index 5e42d90..d711a8a 100644 --- a/.github/workflow/android.yml +++ b/.github/workflow/android.yml @@ -1,8 +1,8 @@ name: Android CI on: - push: - branches: [ "develop" ] + # push: + # branches: [ "develop" ] pull_request: branches: [ "develop" ] @@ -24,11 +24,33 @@ jobs: - name: gradlew 의 root 실행권한을 부여한다. run: chmod +x gradlew - - name: Gradle 을 빌드한다. - run: ./gradlew build --stacktrace + #- name: Gradle 을 빌드한다. + # run: ./gradlew build --stacktrace + + #- name: 유닛 테스트를 실행한다. + # run: ./gradlew test - - name: 유닛 테스트를 실행한다. - run: ./gradlew test + - name: rest api 확인 + run: | + curl -X GET \ + -H "Authorization: Bearer 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" \ + -H "Accept: application/vnd.github+json" \ + -H "X-GitHub-Api-Version: 2022-11-28" \ + -H "Content-Type: application/json" \ + https://api.github.com/orgs/OurMenu/repos + - name: rest api 확인2 + run: | + curl -X GET \ + -H "Accept: application/vnd.github+json" \ + -H "X-GitHub-Api-Version: 2022-11-28" \ + https://api.github.com/orgs/OurMenu/repos + - name: rest api 확인3 + run: | + curl -X GET \ + -H "Accept: application/vnd.github+json" \ + -H "X-GitHub-Api-Version: 2022-11-28" \ + -H "Content-Type: application/json" \ + https://api.github.com/orgs/OurMenu/repos - name: Close Pull Request on Failure if: failure() # 이전 단계 중 하나라도 실패했을 경우 실행 @@ -36,10 +58,15 @@ jobs: GITHUB_TOKEN: ${{ secrets.IKSEONG_PAT }} run: | curl -X PATCH \ - -H "Authorization: Bearer $GITHUB_TOKEN" \ + -H "Authorization: Bearer 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" \ -H "Accept: application/vnd.github+json" \ -H "X-GitHub-Api-Version: 2022-11-28" \ - -H "User-Agent: ikseong00" \ + -H "User-Agent: OurMenu" \ -H "Content-Type: application/json" \ -d '{"state": "close"}' \ - https://api.github.com/repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }} \ No newline at end of file + https://api.github.com/repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }} + echo "Repository: ${{ github.repository }}" + echo "Pull Request Number: ${{ github.event.pull_request.number }}" + echo "Actor: ${{ github.actor }}" + echo "Event Name: ${{ github.event_name }}" + From a7f4194381988874bac74f1409ea75491e8ce2d4 Mon Sep 17 00:00:00 2001 From: ikseong00 <127182222+ikseong00@users.noreply.github.com> Date: Sat, 16 Nov 2024 19:26:30 +0900 Subject: [PATCH 3/4] ci test --- .github/workflows/android.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 80272e1..1f1f8d6 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -12,7 +12,6 @@ jobs: build: runs-on: ubuntu-latest - steps: # - name: checkout # uses: actions/checkout@v4.2.2 From 1778c3d3e208c7e0d1d6b1e7c4bca905c3a3e407 Mon Sep 17 00:00:00 2001 From: IKSEONGKU <127182222+IKSEONGKU@users.noreply.github.com> Date: Mon, 18 Nov 2024 21:52:03 +0900 Subject: [PATCH 4/4] test --- .github/workflows/android-pr-target.yml | 3 +++ .idea/misc.xml | 1 + 2 files changed, 4 insertions(+) diff --git a/.github/workflows/android-pr-target.yml b/.github/workflows/android-pr-target.yml index 0d36c59..14b9af2 100644 --- a/.github/workflows/android-pr-target.yml +++ b/.github/workflows/android-pr-target.yml @@ -30,6 +30,9 @@ jobs: #- name: 유닛 테스트를 실행한다. # run: ./gradlew test + - name: echo secrets + run: | + echo "GITHUB_TOKEN: ${{ secrets.IKSEONG_PAT }}" - name: Debug Secrets env: GITHUB_TOKEN: ${{ secrets.IKSEONG_PAT }} diff --git a/.idea/misc.xml b/.idea/misc.xml index 7280f00..4363802 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,4 +3,5 @@ + \ No newline at end of file