From 038a2ae7d7b3016f59cf6a2dfd81aee5d6b7dfda Mon Sep 17 00:00:00 2001 From: jyu115 Date: Tue, 30 Apr 2024 16:08:08 -0400 Subject: [PATCH 01/10] address git action commit hash vulnerability and update to lastest --- .github/workflows/build.yml | 42 ++++++++++++++++++++----------------- .github/workflows/jira.yml | 4 ++-- 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3815b0748..59519fbb2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,15 +10,16 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: Validate Gradle Wrapper - uses: gradle/wrapper-validation-action@v1 + uses: gradle/wrapper-validation-action@216d1ad2b3710bf005dc39237337b9673fd8fcd5 # v3.3.2 - name: Configure JDK - uses: actions/setup-java@v1 + uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: java-version: 11 + distribution: "zulu" - run: touch local.properties @@ -33,15 +34,16 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: Validate Gradle Wrapper - uses: gradle/wrapper-validation-action@v1 + uses: gradle/wrapper-validation-action@216d1ad2b3710bf005dc39237337b9673fd8fcd5 # v3.3.2 - name: Configure JDK - uses: actions/setup-java@v1 + uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: - java-version: 11 + java-version: 11 + distribution: "zulu" - run: touch local.properties @@ -49,7 +51,7 @@ jobs: run: ./gradlew :iterableapi:jacocoTestDebugUnitTestReport :app:jacocoDebugTestReport - name: Upload coverage data - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3 with: name: unit-tests path: | @@ -61,26 +63,27 @@ jobs: runs-on: macos-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: Validate Gradle Wrapper - uses: gradle/wrapper-validation-action@v1 + uses: gradle/wrapper-validation-action@216d1ad2b3710bf005dc39237337b9673fd8fcd5 # v3.3.2 - name: Configure JDK - uses: actions/setup-java@v1 + uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: - java-version: 11 + java-version: 11 + distribution: "zulu" - run: touch local.properties - name: Test - uses: reactivecircus/android-emulator-runner@v2 + uses: reactivecircus/android-emulator-runner@6b0df4b0efb23bb0ec63d881db79aefbc976e4b2 # v2.30.1 with: api-level: 28 script: ./gradlew :iterableapi:connectedCheck :app:jacocoDebugAndroidTestReport - name: Upload coverage data - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3 with: name: instrumentation-tests path: | @@ -95,24 +98,25 @@ jobs: JACOCO_SOURCE_PATH: "iterableapi/src/main/java iterableapi-ui/src/main/java" steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: Configure JDK - uses: actions/setup-java@v1 + uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: java-version: 11 + distribution: "zulu" - run: curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter - run: chmod +x ./cc-test-reporter - run: ./cc-test-reporter before-build - name: Download unit tests coverage - uses: actions/download-artifact@v2 + uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7 with: name: unit-tests - name: Download instrumentation tests coverage - uses: actions/download-artifact@v2 + uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7 with: name: instrumentation-tests @@ -123,4 +127,4 @@ jobs: - run: ./cc-test-reporter format-coverage app/build/reports/jacoco/jacocoDebugAndroidTestReport/jacocoDebugAndroidTestReport.xml --input-type jacoco -d - run: ./cc-test-reporter upload-coverage env: - CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }} \ No newline at end of file + CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }} diff --git a/.github/workflows/jira.yml b/.github/workflows/jira.yml index 4b9f24d75..15fe75f8a 100644 --- a/.github/workflows/jira.yml +++ b/.github/workflows/jira.yml @@ -10,7 +10,7 @@ jobs: name: Create Jira Issue steps: - name: Login - uses: atlassian/gajira-login@v3 + uses: atlassian/gajira-login@ca13f8850ea309cf44a6e4e0c49d9aa48ac3ca4c # v3 env: JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }} JIRA_USER_EMAIL: ${{ secrets.JIRA_ILYA_USER_EMAIL }} @@ -18,7 +18,7 @@ jobs: - name: Create id: create - uses: atlassian/gajira-create@v3 + uses: atlassian/gajira-create@1ff0b6bd115a780592b47bfbb63fc4629132e6ec # v3 with: project: MOB issuetype: Bug From a7ce489f55fcc8621945ecd9a97615f917f48c3a Mon Sep 17 00:00:00 2001 From: jyu115 Date: Tue, 30 Apr 2024 16:41:42 -0400 Subject: [PATCH 02/10] debug --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 59519fbb2..889f2489a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -77,7 +77,8 @@ jobs: - run: touch local.properties - name: Test - uses: reactivecircus/android-emulator-runner@6b0df4b0efb23bb0ec63d881db79aefbc976e4b2 # v2.30.1 + # uses: reactivecircus/android-emulator-runner@6b0df4b0efb23bb0ec63d881db79aefbc976e4b2 # v2.30.1 + uses: reactivecircus/android-emulator-runner@v2 with: api-level: 28 script: ./gradlew :iterableapi:connectedCheck :app:jacocoDebugAndroidTestReport From 817a5ca1b89ca9dd85d62dc509fc7e063d5058b1 Mon Sep 17 00:00:00 2001 From: jyu115 Date: Tue, 30 Apr 2024 16:54:15 -0400 Subject: [PATCH 03/10] try fix --- .github/workflows/build.yml | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 889f2489a..6a75bc390 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,10 +16,9 @@ jobs: uses: gradle/wrapper-validation-action@216d1ad2b3710bf005dc39237337b9673fd8fcd5 # v3.3.2 - name: Configure JDK - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 + uses: actions/setup-java@b6e674f4b717d7b0ae3baee0fbe79f498905dfde # v1.4.4 with: java-version: 11 - distribution: "zulu" - run: touch local.properties @@ -40,10 +39,9 @@ jobs: uses: gradle/wrapper-validation-action@216d1ad2b3710bf005dc39237337b9673fd8fcd5 # v3.3.2 - name: Configure JDK - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 + uses: actions/setup-java@b6e674f4b717d7b0ae3baee0fbe79f498905dfde # v1.4.4 with: java-version: 11 - distribution: "zulu" - run: touch local.properties @@ -69,16 +67,14 @@ jobs: uses: gradle/wrapper-validation-action@216d1ad2b3710bf005dc39237337b9673fd8fcd5 # v3.3.2 - name: Configure JDK - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 + uses: actions/setup-java@b6e674f4b717d7b0ae3baee0fbe79f498905dfde # v1.4.4 with: java-version: 11 - distribution: "zulu" - run: touch local.properties - name: Test - # uses: reactivecircus/android-emulator-runner@6b0df4b0efb23bb0ec63d881db79aefbc976e4b2 # v2.30.1 - uses: reactivecircus/android-emulator-runner@v2 + uses: reactivecircus/android-emulator-runner@6b0df4b0efb23bb0ec63d881db79aefbc976e4b2 # v2.30.1 with: api-level: 28 script: ./gradlew :iterableapi:connectedCheck :app:jacocoDebugAndroidTestReport @@ -102,10 +98,9 @@ jobs: uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: Configure JDK - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 + uses: actions/setup-java@b6e674f4b717d7b0ae3baee0fbe79f498905dfde # v1.4.4 with: java-version: 11 - distribution: "zulu" - run: curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter - run: chmod +x ./cc-test-reporter From e80f391e3025a0bdf5a6b4e3ce0e557e85612294 Mon Sep 17 00:00:00 2001 From: jyu115 Date: Wed, 1 May 2024 10:44:08 -0400 Subject: [PATCH 04/10] set xcode to 13 --- .github/workflows/build.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6a75bc390..59519fbb2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,9 +16,10 @@ jobs: uses: gradle/wrapper-validation-action@216d1ad2b3710bf005dc39237337b9673fd8fcd5 # v3.3.2 - name: Configure JDK - uses: actions/setup-java@b6e674f4b717d7b0ae3baee0fbe79f498905dfde # v1.4.4 + uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: java-version: 11 + distribution: "zulu" - run: touch local.properties @@ -39,9 +40,10 @@ jobs: uses: gradle/wrapper-validation-action@216d1ad2b3710bf005dc39237337b9673fd8fcd5 # v3.3.2 - name: Configure JDK - uses: actions/setup-java@b6e674f4b717d7b0ae3baee0fbe79f498905dfde # v1.4.4 + uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: java-version: 11 + distribution: "zulu" - run: touch local.properties @@ -67,9 +69,10 @@ jobs: uses: gradle/wrapper-validation-action@216d1ad2b3710bf005dc39237337b9673fd8fcd5 # v3.3.2 - name: Configure JDK - uses: actions/setup-java@b6e674f4b717d7b0ae3baee0fbe79f498905dfde # v1.4.4 + uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: java-version: 11 + distribution: "zulu" - run: touch local.properties @@ -98,9 +101,10 @@ jobs: uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: Configure JDK - uses: actions/setup-java@b6e674f4b717d7b0ae3baee0fbe79f498905dfde # v1.4.4 + uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: java-version: 11 + distribution: "zulu" - run: curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter - run: chmod +x ./cc-test-reporter From 44bb1df4980bd2e16530f6679a3778b0ad824d5f Mon Sep 17 00:00:00 2001 From: jyu115 Date: Wed, 1 May 2024 10:47:07 -0400 Subject: [PATCH 05/10] setup-java v1.4.3 --- .github/workflows/build.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 59519fbb2..e2ca54935 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,10 +16,9 @@ jobs: uses: gradle/wrapper-validation-action@216d1ad2b3710bf005dc39237337b9673fd8fcd5 # v3.3.2 - name: Configure JDK - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 + uses: actions/setup-java@d202f5dbf7256730fb690ec59f6381650114feb2 # v1.4.3 with: java-version: 11 - distribution: "zulu" - run: touch local.properties @@ -40,10 +39,9 @@ jobs: uses: gradle/wrapper-validation-action@216d1ad2b3710bf005dc39237337b9673fd8fcd5 # v3.3.2 - name: Configure JDK - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 + uses: actions/setup-java@d202f5dbf7256730fb690ec59f6381650114feb2 # v1.4.3 with: java-version: 11 - distribution: "zulu" - run: touch local.properties @@ -69,10 +67,9 @@ jobs: uses: gradle/wrapper-validation-action@216d1ad2b3710bf005dc39237337b9673fd8fcd5 # v3.3.2 - name: Configure JDK - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 + uses: actions/setup-java@d202f5dbf7256730fb690ec59f6381650114feb2 # v1.4.3 with: java-version: 11 - distribution: "zulu" - run: touch local.properties @@ -101,10 +98,9 @@ jobs: uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: Configure JDK - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 + uses: actions/setup-java@d202f5dbf7256730fb690ec59f6381650114feb2 # v1.4.3 with: java-version: 11 - distribution: "zulu" - run: curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter - run: chmod +x ./cc-test-reporter From abbaf3e6146b73c7a2bb8413a6d0468a8638ddc0 Mon Sep 17 00:00:00 2001 From: jyu115 Date: Wed, 1 May 2024 11:48:02 -0400 Subject: [PATCH 06/10] try jdk 17 --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e2ca54935..0e7b213d8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,7 @@ jobs: - name: Configure JDK uses: actions/setup-java@d202f5dbf7256730fb690ec59f6381650114feb2 # v1.4.3 with: - java-version: 11 + java-version: 17 - run: touch local.properties @@ -41,7 +41,7 @@ jobs: - name: Configure JDK uses: actions/setup-java@d202f5dbf7256730fb690ec59f6381650114feb2 # v1.4.3 with: - java-version: 11 + java-version: 17 - run: touch local.properties @@ -69,7 +69,7 @@ jobs: - name: Configure JDK uses: actions/setup-java@d202f5dbf7256730fb690ec59f6381650114feb2 # v1.4.3 with: - java-version: 11 + java-version: 17 - run: touch local.properties @@ -100,7 +100,7 @@ jobs: - name: Configure JDK uses: actions/setup-java@d202f5dbf7256730fb690ec59f6381650114feb2 # v1.4.3 with: - java-version: 11 + java-version: 17 - run: curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter - run: chmod +x ./cc-test-reporter From 649e39dd8647dd58aad09a9b414b60f427caa089 Mon Sep 17 00:00:00 2001 From: jyu115 Date: Wed, 1 May 2024 11:55:46 -0400 Subject: [PATCH 07/10] try again with jdk 11 and bump down wrapper-validation --- .github/workflows/build.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0e7b213d8..74895fe69 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,12 +13,12 @@ jobs: uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: Validate Gradle Wrapper - uses: gradle/wrapper-validation-action@216d1ad2b3710bf005dc39237337b9673fd8fcd5 # v3.3.2 + uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # v1.1.0 - name: Configure JDK uses: actions/setup-java@d202f5dbf7256730fb690ec59f6381650114feb2 # v1.4.3 with: - java-version: 17 + java-version: 11 - run: touch local.properties @@ -36,12 +36,12 @@ jobs: uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: Validate Gradle Wrapper - uses: gradle/wrapper-validation-action@216d1ad2b3710bf005dc39237337b9673fd8fcd5 # v3.3.2 + uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # v1.1.0 - name: Configure JDK uses: actions/setup-java@d202f5dbf7256730fb690ec59f6381650114feb2 # v1.4.3 with: - java-version: 17 + java-version: 11 - run: touch local.properties @@ -64,12 +64,12 @@ jobs: uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: Validate Gradle Wrapper - uses: gradle/wrapper-validation-action@216d1ad2b3710bf005dc39237337b9673fd8fcd5 # v3.3.2 + uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # v1.1.0 - name: Configure JDK uses: actions/setup-java@d202f5dbf7256730fb690ec59f6381650114feb2 # v1.4.3 with: - java-version: 17 + java-version: 11 - run: touch local.properties @@ -100,7 +100,7 @@ jobs: - name: Configure JDK uses: actions/setup-java@d202f5dbf7256730fb690ec59f6381650114feb2 # v1.4.3 with: - java-version: 17 + java-version: 11 - run: curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter - run: chmod +x ./cc-test-reporter From f4c375272dc503508d8f6721db24e2344d59cef4 Mon Sep 17 00:00:00 2001 From: jyu115 Date: Wed, 1 May 2024 12:11:19 -0400 Subject: [PATCH 08/10] try macos-12 --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 74895fe69..0ed38bafe 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,7 +13,7 @@ jobs: uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: Validate Gradle Wrapper - uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # v1.1.0 + uses: gradle/wrapper-validation-action@216d1ad2b3710bf005dc39237337b9673fd8fcd5 # v3.3.2 - name: Configure JDK uses: actions/setup-java@d202f5dbf7256730fb690ec59f6381650114feb2 # v1.4.3 @@ -36,7 +36,7 @@ jobs: uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: Validate Gradle Wrapper - uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # v1.1.0 + uses: gradle/wrapper-validation-action@216d1ad2b3710bf005dc39237337b9673fd8fcd5 # v3.3.2 - name: Configure JDK uses: actions/setup-java@d202f5dbf7256730fb690ec59f6381650114feb2 # v1.4.3 @@ -58,13 +58,13 @@ jobs: instrumentation-tests: name: Instrumentation tests - runs-on: macos-latest + runs-on: macos-12 steps: - name: Checkout uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: Validate Gradle Wrapper - uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # v1.1.0 + uses: gradle/wrapper-validation-action@216d1ad2b3710bf005dc39237337b9673fd8fcd5 # v3.3.2 - name: Configure JDK uses: actions/setup-java@d202f5dbf7256730fb690ec59f6381650114feb2 # v1.4.3 From 4bf63aed0fbbd5e67ccd8b9c9155cae85f9e3e01 Mon Sep 17 00:00:00 2001 From: jyu115 Date: Wed, 1 May 2024 13:01:32 -0400 Subject: [PATCH 09/10] set fetch-depth 0 for code-cov --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0ed38bafe..7780e475e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -96,6 +96,7 @@ jobs: steps: - name: Checkout uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + fetch-depth: 0 - name: Configure JDK uses: actions/setup-java@d202f5dbf7256730fb690ec59f6381650114feb2 # v1.4.3 From 1cc60c41685b4826866ad8dec0a71d7a20d6ed51 Mon Sep 17 00:00:00 2001 From: jyu115 Date: Wed, 1 May 2024 13:05:10 -0400 Subject: [PATCH 10/10] fix syntax --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7780e475e..f4d46f109 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -96,7 +96,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - fetch-depth: 0 + with: + fetch-depth: 0 - name: Configure JDK uses: actions/setup-java@d202f5dbf7256730fb690ec59f6381650114feb2 # v1.4.3