From c4c90f019071d9fea37b3211f3fee27139a12a42 Mon Sep 17 00:00:00 2001 From: PabloMK7 Date: Wed, 6 Mar 2024 18:38:51 +0100 Subject: [PATCH] Remove dependencies to old docker containers (#21) * Fix CI * Change missing yml --- .github/workflows/build.yml | 2 +- .github/workflows/ci-merge.js | 2 +- .github/workflows/format.yml | 2 +- .github/workflows/publish.yml | 100 -------------------------------- .github/workflows/transifex.yml | 2 +- 5 files changed, 4 insertions(+), 104 deletions(-) delete mode 100644 .github/workflows/publish.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e828152504..0ac19bfb58 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,7 +28,7 @@ jobs: matrix: target: ["appimage", "fresh"] container: - image: citraemu/build-environments:linux-${{ matrix.target }} + image: pablomk7/build-environments:linux-${{ matrix.target }} options: -u 1001 env: CCACHE_DIR: ${{ github.workspace }}/.ccache diff --git a/.github/workflows/ci-merge.js b/.github/workflows/ci-merge.js index 39eb43d6e3..12b6dd2991 100644 --- a/.github/workflows/ci-merge.js +++ b/.github/workflows/ci-merge.js @@ -200,7 +200,7 @@ async function mergebot(github, context, execa) { } console.info("The following pull requests will be merged:"); console.table(displayList); - await fetchPullRequests(pulls, "https://github.com/citra-emu/citra", execa); + await fetchPullRequests(pulls, "https://github.com/PabloMK7/citra", execa); const mergeResults = await mergePullRequests(pulls, execa); await generateReadme(pulls, context, mergeResults, execa); await tagAndPush(github, context.repo.owner, `${context.repo.repo}-canary`, execa, true); diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index 0d9a30caf4..31d3c89362 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -10,7 +10,7 @@ jobs: clang-format: runs-on: ubuntu-latest container: - image: citraemu/build-environments:linux-fresh + image: pablomk7/build-environments:linux-fresh options: -u 1001 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml deleted file mode 100644 index 8c63dc6bf5..0000000000 --- a/.github/workflows/publish.yml +++ /dev/null @@ -1,100 +0,0 @@ -name: citra-publish - -on: - schedule: - - cron: '7 0 * * *' - workflow_dispatch: - inputs: - nightly: - description: 'Whether to trigger a nightly build (true/false/auto)' - required: false - default: 'true' - canary: - description: 'Whether to trigger a canary build (true/false/auto)' - required: false - default: 'true' - -jobs: - nightly: - runs-on: ubuntu-latest - if: ${{ github.event.inputs.nightly != 'false' && github.repository == 'citra-emu/citra' }} - steps: - # this checkout is required to make sure the GitHub Actions scripts are available - - uses: actions/checkout@v4 - name: Pre-checkout - with: - submodules: false - - uses: actions/github-script@v7 - id: check-changes - name: 'Check for new changes' - env: - # 24 hours - DETECTION_TIME_FRAME: 86400000 - with: - result-encoding: string - script: | - if (context.payload.inputs && context.payload.inputs.nightly === 'true') return true; - const checkBaseChanges = require('./.github/workflows/ci-merge.js').checkBaseChanges; - return checkBaseChanges(github, context); - - run: npm install execa@5 - if: ${{ steps.check-changes.outputs.result == 'true' }} - - uses: actions/checkout@v4 - name: Checkout - if: ${{ steps.check-changes.outputs.result == 'true' }} - with: - path: 'citra-merge' - fetch-depth: 0 - submodules: true - token: ${{ secrets.ALT_GITHUB_TOKEN }} - - uses: actions/github-script@v7 - name: 'Update and tag new commits' - if: ${{ steps.check-changes.outputs.result == 'true' }} - env: - ALT_GITHUB_TOKEN: ${{ secrets.ALT_GITHUB_TOKEN }} - with: - script: | - const execa = require("execa"); - const tagAndPush = require('./.github/workflows/ci-merge.js').tagAndPush; - process.chdir('${{ github.workspace }}/citra-merge'); - tagAndPush(github, context.repo.owner, `${context.repo.repo}-nightly`, execa); - canary: - runs-on: ubuntu-latest - if: ${{ github.event.inputs.canary != 'false' && github.repository == 'citra-emu/citra' }} - steps: - # this checkout is required to make sure the GitHub Actions scripts are available - - uses: actions/checkout@v4 - name: Pre-checkout - with: - submodules: false - - uses: actions/github-script@v7 - id: check-changes - name: 'Check for new changes' - env: - # 24 hours - DETECTION_TIME_FRAME: 86400000 - with: - script: | - if (context.payload.inputs && context.payload.inputs.canary === 'true') return true; - const checkCanaryChanges = require('./.github/workflows/ci-merge.js').checkCanaryChanges; - return checkCanaryChanges(github, context); - - run: npm install execa@5 - if: ${{ steps.check-changes.outputs.result == 'true' }} - - uses: actions/checkout@v4 - name: Checkout - if: ${{ steps.check-changes.outputs.result == 'true' }} - with: - path: 'citra-merge' - fetch-depth: 0 - submodules: true - token: ${{ secrets.ALT_GITHUB_TOKEN }} - - uses: actions/github-script@v7 - name: 'Check and merge canary changes' - if: ${{ steps.check-changes.outputs.result == 'true' }} - env: - ALT_GITHUB_TOKEN: ${{ secrets.ALT_GITHUB_TOKEN }} - with: - script: | - const execa = require("execa"); - const mergebot = require('./.github/workflows/ci-merge.js').mergebot; - process.chdir('${{ github.workspace }}/citra-merge'); - mergebot(github, context, execa); diff --git a/.github/workflows/transifex.yml b/.github/workflows/transifex.yml index b7a695f2bc..c5ece1a839 100644 --- a/.github/workflows/transifex.yml +++ b/.github/workflows/transifex.yml @@ -7,7 +7,7 @@ on: jobs: transifex: runs-on: ubuntu-latest - container: citraemu/build-environments:linux-fresh + container: pablomk7/build-environments:linux-fresh if: ${{ github.repository == 'citra-emu/citra' }} steps: - uses: actions/checkout@v4