diff --git a/.dockerignore b/.dockerignore index 8f595b4d9c..977836d339 100644 --- a/.dockerignore +++ b/.dockerignore @@ -11,4 +11,3 @@ **/test/androidTestEspresso/res/values/arrays.xml reproducible-builds/certs reproducible-builds/outputs -reproducible-builds/test-reports diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3871f6ba65..a86a5a0b57 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,6 +10,9 @@ on: - '.github/FUNDING.yml' - '.github/ISSUE_TEMPLATE/**' +permissions: + contents: read # to fetch code (actions/checkout) + jobs: wrapper_validation: name: Validate Gradle wrapper @@ -36,17 +39,19 @@ jobs: sudo swapon /swapB swapon --show - - name: Set up builder image - run: docker-compose build - working-directory: reproducible-builds + - name: Set up JDK 11 + uses: actions/setup-java@v3 + with: + distribution: temurin + java-version: 11 + cache: gradle - name: Run tests - run: docker-compose run test - working-directory: reproducible-builds + run: ./gradlew build --no-daemon - name: Archive reports for failed tests if: "failure()" uses: actions/upload-artifact@v3 with: name: test-reports - path: "reproducible-builds/test-reports" + path: '*/build/reports' diff --git a/.gitignore b/.gitignore index 8558e66f8e..f2166627fe 100644 --- a/.gitignore +++ b/.gitignore @@ -11,4 +11,3 @@ signing.properties test/androidTestEspresso/res/values/arrays.xml /reproducible-builds/certs /reproducible-builds/outputs -/reproducible-builds/test-reports diff --git a/reproducible-builds/docker-compose.yml b/reproducible-builds/docker-compose.yml index 96450bcdd4..9cb5358d98 100644 --- a/reproducible-builds/docker-compose.yml +++ b/reproducible-builds/docker-compose.yml @@ -4,7 +4,7 @@ services: image: reproducible-molly build: context: .. - command: :app:assembleRelease :app:bundleRelease + command: :app:assembleRelease :app:bundleRelease --no-daemon volumes: - ./certs:/molly/app/certs:ro - ./outputs:/molly/app/build/outputs @@ -18,14 +18,3 @@ services: - CI_KEYSTORE_PATH - CI_KEYSTORE_PASSWORD - CI_KEYSTORE_ALIAS - test: - image: reproducible-molly - build: - context: .. - command: build - volumes: - - ./test-reports:/molly/app/build/reports - environment: - - BUILD_SCAN=1 - profiles: - - test diff --git a/reproducible-builds/test-reports/.keep b/reproducible-builds/test-reports/.keep deleted file mode 100644 index e69de29bb2..0000000000