From 70d7eac9371c2116edfec8d655bba2447b47a109 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Wed, 6 Sep 2023 19:54:42 +0200 Subject: [PATCH] GitHub Actions: Modernize pipelines Remove Gitlab CI configuration for good. --- .../workflows/gradle-wrapper-validation.yml | 3 +- .github/workflows/main.yml | 47 +++++++------------ .github/workflows/mobsf.yml | 25 +++------- .gitlab-ci.yml | 44 ----------------- 4 files changed, 24 insertions(+), 95 deletions(-) delete mode 100644 .gitlab-ci.yml diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml index 405a2b3..0ec7493 100644 --- a/.github/workflows/gradle-wrapper-validation.yml +++ b/.github/workflows/gradle-wrapper-validation.yml @@ -3,8 +3,7 @@ on: [push, pull_request] jobs: validation: - name: "Validation" runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: gradle/wrapper-validation-action@v1 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c380880..20e899c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,15 +1,15 @@ name: Main CI - on: [push] jobs: spotless: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Set up JDK 17 - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: + distribution: temurin java-version: 17 - name: Run Spotless run: ./gradlew spotlessCheck @@ -17,28 +17,22 @@ jobs: build: runs-on: macos-12 steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Set up JDK 17 - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: + distribution: temurin java-version: 17 - name: Build with Gradle run: ./gradlew build - - name: Archive .gradle folder - uses: actions/upload-artifact@v1 - with: - name: .gradle - path: .gradle - - name: Archive build folder - uses: actions/upload-artifact@v1 - with: - name: build - path: build - - name: Archive kase64/build folder - uses: actions/upload-artifact@v1 + - name: Archive build artifacts + uses: actions/upload-artifact@v3 with: name: kase64_build - path: kase64/build + path: | + .gradle + build + kase64/build publish: needs: build @@ -50,21 +44,14 @@ jobs: SONATYPE_GPG_KEY_PASSWORD: ${{ secrets.SONATYPE_GPG_KEY_PASSWORD }} SECRETS_KEY: ${{ secrets.SECRETS_KEY }} steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Set up JDK 17 - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: + distribution: temurin java-version: 17 - - name: Download .gradle folder - uses: actions/download-artifact@v1 - with: - name: .gradle - - name: Download build folder - uses: actions/download-artifact@v1 - with: - name: build - - name: Download kase64/build folder - uses: actions/download-artifact@v1 + - name: Download build artifacts + uses: actions/download-artifact@v3 with: name: kase64_build - name: Publish to Sonatype (Maven Central) diff --git a/.github/workflows/mobsf.yml b/.github/workflows/mobsf.yml index 7cc6f0c..5fd9959 100644 --- a/.github/workflows/mobsf.yml +++ b/.github/workflows/mobsf.yml @@ -1,42 +1,29 @@ -# This workflow uses actions that are not certified by GitHub. -# They are provided by a third-party and are governed by -# separate terms of service, privacy policy, and support -# documentation. - name: MobSF - on: push: branches: [ main ] pull_request: - branches: [ main ] + branches: [ main ] schedule: - cron: '22 8 * * 0' -permissions: - contents: read - jobs: mobile-security: permissions: contents: read # for actions/checkout to fetch code security-events: write # for github/codeql-action/upload-sarif to upload SARIF results runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - - name: Setup python - uses: actions/setup-python@v2 + - uses: actions/checkout@v4 + - name: Setup Python 3.10 + uses: actions/setup-python@v4 with: - python-version: 3.8 - + python-version: 3.10 - name: Run mobsfscan uses: MobSF/mobsfscan@a60d10a83af68e23e0b30611c6515da604f06f65 with: args: . --sarif --output results.sarif || true - - name: Upload mobsfscan report uses: github/codeql-action/upload-sarif@v2 with: - sarif_file: results.sarif + sarif_file: results.sarif \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 2b86091..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,44 +0,0 @@ ---- -image: saschpe/android-sdk:29_29.0.2 - -assemble: - stage: build - script: - - ./gradlew assemble - artifacts: - expire_in: 1 day - paths: - - "*/build/**" - -lintDebug: - stage: build - script: - - ./gradlew lintDebug - artifacts: - paths: - - "*/build/reports/lint-results.*" - -spotless: - stage: build - script: - - ./gradlew spotlessCheck - -test: - stage: test - script: - - ./gradlew test - dependencies: - - assemble - artifacts: - reports: - junit: "*/build/test-results/**/TEST-*.xml" - -publish: - stage: deploy - only: - - master - script: - - ./scripts/secret decrypt --password ${SECRETS_KEY} - - ./scripts/publish - dependencies: - - assemble