From d56bc61c8bc8c85887ef0dec9c20512d66494286 Mon Sep 17 00:00:00 2001 From: Nikhil Badyal Date: Mon, 3 Oct 2022 00:12:32 +0530 Subject: [PATCH] =?UTF-8?q?=F0=9F=91=B7=20Updated=20CI=20Job=20Names?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-apk-artifact.yml | 6 ++-- .github/workflows/build-apk.yml | 2 -- .github/workflows/codeql-analysis.yml | 33 ------------------- .github/workflows/linter.yml | 1 - .github/workflows/pr-checks.yml | 8 ++--- ...e-commit-autoupdate.yml => pre-commit.yml} | 7 ++-- ...upload-to-tg.yml => telegram-uploader.yml} | 2 +- .github/workflows/virus-total-scan.yml | 2 +- 8 files changed, 9 insertions(+), 52 deletions(-) rename .github/workflows/{pre-commit-autoupdate.yml => pre-commit.yml} (84%) rename .github/workflows/{upload-to-tg.yml => telegram-uploader.yml} (92%) diff --git a/.github/workflows/build-apk-artifact.yml b/.github/workflows/build-apk-artifact.yml index 6e77ab0..ee88850 100644 --- a/.github/workflows/build-apk-artifact.yml +++ b/.github/workflows/build-apk-artifact.yml @@ -1,17 +1,15 @@ -name: Build Revanced APK for PR -# Enable Buildkit and let compose use it to speed up image building +name: Build Artifacts PR env: DOCKER_BUILDKIT: 1 COMPOSE_DOCKER_CLI_BUILD: 1 on: - workflow_dispatch: workflow_call: concurrency: group: ${{ github.head_ref || github.run_id }} cancel-in-progress: true jobs: - build-apk: + build-apk-pr: name: APK Build runs-on: ubuntu-latest timeout-minutes: 20 diff --git a/.github/workflows/build-apk.yml b/.github/workflows/build-apk.yml index 619783f..09bc354 100644 --- a/.github/workflows/build-apk.yml +++ b/.github/workflows/build-apk.yml @@ -1,12 +1,10 @@ name: Build Revanced APK -# Enable Buildkit and let compose use it to speed up image building env: DOCKER_BUILDKIT: 1 COMPOSE_DOCKER_CLI_BUILD: 1 HAVE_TELEGRAM_API_ID: ${{ secrets.TELEGRAM_API_ID != '' }} on: workflow_dispatch: - workflow_call: concurrency: group: ${{ github.head_ref || github.run_id }} diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index fbed342..6741067 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -1,14 +1,3 @@ -# For most projects, this workflow file will not need changing; you simply need -# to commit it to your repository. -# -# You may wish to alter this file to override the set of languages analyzed, -# or to provide custom queries or build logic. -# -# ******** NOTE ******** -# We have attempted to detect the languages in your repository. Please check -# the `language` matrix defined below to confirm you have the correct set of -# supported CodeQL languages. -# name: "CodeQL" on: @@ -28,40 +17,18 @@ jobs: fail-fast: false matrix: language: [ 'python' ] - # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ] - # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support steps: - name: Checkout repository uses: actions/checkout@v3 - # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL uses: github/codeql-action/init@v2 with: languages: ${{ matrix.language }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs - # queries: security-extended,security-and-quality - - - # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). - # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild uses: github/codeql-action/autobuild@v2 - # ℹī¸ Command-line programs to run using the OS shell. - # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun - - # If the Autobuild fails above, remove it and uncomment the following three lines. - # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance. - - # - run: | - # echo "Run, Build Application using script" - # ./location_of_script_within_repo/buildscript.sh - - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v2 diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index c35eba4..8dff7d6 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -1,6 +1,5 @@ name: Linter -# Enable Buildkit and let compose use it to speed up image building env: DOCKER_BUILDKIT: 1 COMPOSE_DOCKER_CLI_BUILD: 1 diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index 7b9eb94..0131384 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -1,16 +1,14 @@ -name: Run Checks for PR -# Enable Buildkit and let compose use it to speed up image building +name: PR Checks env: DOCKER_BUILDKIT: 1 COMPOSE_DOCKER_CLI_BUILD: 1 on: - workflow_dispatch: pull_request: paths-ignore: - '*.md' jobs: - linter: + linter-pr-check: uses: ./.github/workflows/linter.yml - build-apk: + build-apk-pr-check: uses: ./.github/workflows/build-apk-artifact.yml diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit.yml similarity index 84% rename from .github/workflows/pre-commit-autoupdate.yml rename to .github/workflows/pre-commit.yml index 888504d..217a12c 100644 --- a/.github/workflows/pre-commit-autoupdate.yml +++ b/.github/workflows/pre-commit.yml @@ -1,12 +1,9 @@ -# Run pre-commit autoupdate every day at midnight -# and create a pull request if any changes - -name: Pre-commit auto-update +name: Pre-commit update Checker on: schedule: - cron: "15 2 * * *" - workflow_dispatch: # to trigger manually + workflow_dispatch: permissions: contents: read diff --git a/.github/workflows/upload-to-tg.yml b/.github/workflows/telegram-uploader.yml similarity index 92% rename from .github/workflows/upload-to-tg.yml rename to .github/workflows/telegram-uploader.yml index 6965b36..bcabe63 100644 --- a/.github/workflows/upload-to-tg.yml +++ b/.github/workflows/telegram-uploader.yml @@ -1,7 +1,7 @@ name: Telegram Upload on: - workflow_dispatch: # to trigger manually + workflow_dispatch: jobs: tg-upload: diff --git a/.github/workflows/virus-total-scan.yml b/.github/workflows/virus-total-scan.yml index bdd5d74..7de77af 100644 --- a/.github/workflows/virus-total-scan.yml +++ b/.github/workflows/virus-total-scan.yml @@ -5,7 +5,7 @@ on: workflows: [ "Build Revanced APK" ] types: - completed - workflow_dispatch: # to trigger manually + workflow_dispatch: jobs: virustotal: