From 32d70de0e690284089aee92198f72165c1a3727e Mon Sep 17 00:00:00 2001 From: thororen1234 <78185467+thororen1234@users.noreply.github.com> Date: Thu, 15 Aug 2024 01:26:53 -0400 Subject: [PATCH] Workflow updates --- .github/workflows/build.yml | 20 +------------ .github/workflows/codeberg-mirror.yml | 21 +------------ .github/workflows/reportBrokenPlugins.yml | 1 - .github/workflows/syncDev.yml | 36 +++++++++++------------ .github/workflows/syncMain.yml | 36 +++++++++++------------ .github/workflows/test.yml | 21 +------------ 6 files changed, 39 insertions(+), 96 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6e71f929f..16d083e14 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,25 +15,9 @@ env: GITHUB_TOKEN: ${{ secrets.ETOKEN }} jobs: - DetermineRunner: - name: Determine Runner - runs-on: ubuntu-latest - outputs: - runner: ${{ steps.set-runner.outputs.runner }} - steps: - - name: Determine which runner to use - id: set-runner - uses: benjaminmichaelis/get-soonest-available-runner@v1.1.0 - with: - primary-runner: "self-hosted" - fallback-runner: "ubuntu-latest" - min-available-runners: 1 - github-token: ${{ env.GITHUB_TOKEN }} - Build: name: Build Equicord - needs: DetermineRunner - runs-on: ${{ needs.DetermineRunner.outputs.runner}} + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -89,12 +73,10 @@ jobs: rm release/*.map - name: Upload Equicord - if: github.repository == 'Equicord/Equicord' run: | gh release upload latest --clobber dist/release/* - name: Upload Plugins JSON to Ignore repo - if: github.repository == 'Equicord/Equicord' run: | git config --global user.name "$USERNAME" git config --global user.email "78185467+thororen1234@users.noreply.github.com" diff --git a/.github/workflows/codeberg-mirror.yml b/.github/workflows/codeberg-mirror.yml index 0f7ae1d1c..9bbb434d9 100644 --- a/.github/workflows/codeberg-mirror.yml +++ b/.github/workflows/codeberg-mirror.yml @@ -9,28 +9,9 @@ on: - cron: "0 */6 * * *" jobs: - DetermineRunner: - name: Determine Runner - runs-on: ubuntu-latest - outputs: - runner: ${{ steps.set-runner.outputs.runner }} - steps: - - name: Determine which runner to use - id: set-runner - uses: benjaminmichaelis/get-soonest-available-runner@v1.1.0 - with: - primary-runner: "self-hosted" - fallback-runner: "ubuntu-latest" - min-available-runners: 1 - github-token: ${{ env.GITHUB_TOKEN }} - env: - GITHUB_TOKEN: ${{ secrets.ETOKEN }} - codeberg: name: Sync Codeberg and Github - if: github.repository == 'Equicord/Equicord' - needs: DetermineRunner - runs-on: ${{ needs.DetermineRunner.outputs.runner }} + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 with: diff --git a/.github/workflows/reportBrokenPlugins.yml b/.github/workflows/reportBrokenPlugins.yml index e410f5bff..c396c3e92 100644 --- a/.github/workflows/reportBrokenPlugins.yml +++ b/.github/workflows/reportBrokenPlugins.yml @@ -8,7 +8,6 @@ on: jobs: TestPlugins: name: Test Patches - if: github.repository == 'Equicord/Equicord' runs-on: ubuntu-latest steps: diff --git a/.github/workflows/syncDev.yml b/.github/workflows/syncDev.yml index 9890bbbd0..1c1063182 100644 --- a/.github/workflows/syncDev.yml +++ b/.github/workflows/syncDev.yml @@ -1,25 +1,25 @@ name: Sync Vencord Dev env: - WORKFLOW_TOKEN: ${{ secrets.ETOKEN }} - UPSTREAM_URL: "https://github.com/Vendicated/Vencord.git" - UPSTREAM_BRANCH: "dev" - DOWNSTREAM_BRANCH: "dev" + WORKFLOW_TOKEN: ${{ secrets.ETOKEN }} + UPSTREAM_URL: "https://github.com/Vendicated/Vencord.git" + UPSTREAM_BRANCH: "dev" + DOWNSTREAM_BRANCH: "dev" on: - schedule: - - cron: "0 * * * *" - workflow_dispatch: + schedule: + - cron: "0 * * * *" + workflow_dispatch: jobs: - build: - runs-on: ubuntu-latest - steps: - - name: Sync Vencord Dev - id: sync - uses: verticalsync/sync-upstream-repo@master - with: - upstream_repo: ${{ env.UPSTREAM_URL }} - upstream_branch: ${{ env.UPSTREAM_BRANCH }} - downstream_branch: ${{ env.DOWNSTREAM_BRANCH }} - token: ${{ env.WORKFLOW_TOKEN }} + build: + runs-on: ubuntu-latest + steps: + - name: Sync Vencord Dev + id: sync + uses: verticalsync/sync-upstream-repo@master + with: + upstream_repo: ${{ env.UPSTREAM_URL }} + upstream_branch: ${{ env.UPSTREAM_BRANCH }} + downstream_branch: ${{ env.DOWNSTREAM_BRANCH }} + token: ${{ env.WORKFLOW_TOKEN }} diff --git a/.github/workflows/syncMain.yml b/.github/workflows/syncMain.yml index b549a0d7b..147c949f0 100644 --- a/.github/workflows/syncMain.yml +++ b/.github/workflows/syncMain.yml @@ -1,25 +1,25 @@ name: Sync Vencord Main env: - WORKFLOW_TOKEN: ${{ secrets.ETOKEN }} - UPSTREAM_URL: "https://github.com/Vendicated/Vencord.git" - UPSTREAM_BRANCH: "main" - DOWNSTREAM_BRANCH: "main" + WORKFLOW_TOKEN: ${{ secrets.ETOKEN }} + UPSTREAM_URL: "https://github.com/Vendicated/Vencord.git" + UPSTREAM_BRANCH: "main" + DOWNSTREAM_BRANCH: "main" on: - schedule: - - cron: "0 * * * *" - workflow_dispatch: + schedule: + - cron: "0 * * * *" + workflow_dispatch: jobs: - build: - runs-on: ubuntu-latest - steps: - - name: Sync Vencord Main - id: sync - uses: verticalsync/sync-upstream-repo@master - with: - upstream_repo: ${{ env.UPSTREAM_URL }} - upstream_branch: ${{ env.UPSTREAM_BRANCH }} - downstream_branch: ${{ env.DOWNSTREAM_BRANCH }} - token: ${{ env.WORKFLOW_TOKEN }} + build: + runs-on: ubuntu-latest + steps: + - name: Sync Vencord Main + id: sync + uses: verticalsync/sync-upstream-repo@master + with: + upstream_repo: ${{ env.UPSTREAM_URL }} + upstream_branch: ${{ env.UPSTREAM_BRANCH }} + downstream_branch: ${{ env.DOWNSTREAM_BRANCH }} + token: ${{ env.WORKFLOW_TOKEN }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d14307aa3..f550f1516 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,29 +10,10 @@ on: - dev jobs: - DetermineRunner: - name: Determine Runner - if: ${{ github.event_name == 'push' }} - runs-on: ubuntu-latest - outputs: - runner: ${{ steps.set-runner.outputs.runner }} - steps: - - name: Determine which runner to use - id: set-runner - uses: benjaminmichaelis/get-soonest-available-runner@v1.1.0 - with: - primary-runner: "self-hosted" - fallback-runner: "ubuntu-latest" - min-available-runners: 1 - github-token: ${{ env.GITHUB_TOKEN }} - env: - GITHUB_TOKEN: ${{ secrets.ETOKEN }} - Test: name: Test For Pushes - needs: DetermineRunner if: ${{ github.event_name == 'push' }} - runs-on: ${{ needs.DetermineRunner.outputs.runner}} + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4