diff --git a/.github/workflows/cachix-install-nix-action.yml b/.github/workflows/cachix-install-nix-action.yml index daa6d5cdc..adef9189e 100644 --- a/.github/workflows/cachix-install-nix-action.yml +++ b/.github/workflows/cachix-install-nix-action.yml @@ -4,6 +4,10 @@ on: pull_request: push: +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: nix-matrix: runs-on: ubuntu-latest @@ -27,8 +31,5 @@ jobs: matrix: ${{fromJSON(needs.nix-matrix.outputs.matrix)}} steps: - uses: actions/checkout@v4 - - uses: n1hility/cancel-previous-runs@v2 - with: - token: ${{ secrets.GITHUB_TOKEN }} - uses: cachix/install-nix-action@v30 - run: nix build -L '.#${{ matrix.attr }}' diff --git a/.github/workflows/chores.yml b/.github/workflows/chores.yml index dcd8c2011..72f6182bf 100644 --- a/.github/workflows/chores.yml +++ b/.github/workflows/chores.yml @@ -5,18 +5,19 @@ on: branches: - main +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: regen-i18n: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: recursive set-safe-directory: true - - uses: n1hility/cancel-previous-runs@v2 - with: - token: ${{ secrets.GITHUB_TOKEN }} - name: Install gettext run: sudo apt-get install -y gettext - name: Regenerate i18n files @@ -41,13 +42,10 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: recursive set-safe-directory: true - - uses: n1hility/cancel-previous-runs@v2 - with: - token: ${{ secrets.GITHUB_TOKEN }} - name: Format code run: ./tools/code-format/format.sh - name: Create Pull Request @@ -68,12 +66,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: n1hility/cancel-previous-runs@v2 - with: - token: ${{ secrets.GITHUB_TOKEN }} - name: Install doxygen run: sudo apt-get install -y doxygen graphviz - name: Filter repository @@ -112,12 +107,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: n1hility/cancel-previous-runs@v2 - with: - token: ${{ secrets.GITHUB_TOKEN }} - name: Filter repository env: FILTER_BRANCH_SQUELCH_WARNING: 1 diff --git a/.github/workflows/linux-asan.yml b/.github/workflows/linux-asan.yml index 5c791727d..e68c92ec8 100644 --- a/.github/workflows/linux-asan.yml +++ b/.github/workflows/linux-asan.yml @@ -5,6 +5,11 @@ on: branches: - main pull_request: + workflow_dispatch: + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true jobs: asan: @@ -15,13 +20,10 @@ jobs: TEST_RESULTS: /tmp/test-results BUILD: asan steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: recursive set-safe-directory: true - - uses: n1hility/cancel-previous-runs@v2 - with: - token: ${{ secrets.GITHUB_TOKEN }} - run: | make -j 2 all pcsx-redux-tests make -C src/mips/openbios -j 2 BUILD=Release diff --git a/.github/workflows/linux-aur.yml b/.github/workflows/linux-aur.yml index 104d9d1b0..f800e7d0b 100644 --- a/.github/workflows/linux-aur.yml +++ b/.github/workflows/linux-aur.yml @@ -6,6 +6,10 @@ on: - main pull_request: +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: aur-build: runs-on: ubuntu-latest @@ -15,7 +19,7 @@ jobs: - name: Install dependencies run: | pacman -Syu --noconfirm --needed capstone curl ffmpeg freetype2 glfw libuv sdl2 zlib git make pkg-config sudo base-devel pacman-contrib - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: set-safe-directory: true - name: Create builduser diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml index 2e329d8d5..57d3bbabd 100644 --- a/.github/workflows/linux-build.yml +++ b/.github/workflows/linux-build.yml @@ -5,6 +5,11 @@ on: branches: - main pull_request: + workflow_dispatch: + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true jobs: build: @@ -15,13 +20,10 @@ jobs: env: TEST_RESULTS: /tmp/test-results steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: recursive set-safe-directory: true - - uses: n1hility/cancel-previous-runs@v2 - with: - token: ${{ secrets.GITHUB_TOKEN }} - run: | make -j 2 all pcsx-redux-tests tools make -C src/mips/tests -j 2 PCSX_TESTS=true diff --git a/.github/workflows/linux-coverage.yml b/.github/workflows/linux-coverage.yml index 0a36e64f7..d9dc7045d 100644 --- a/.github/workflows/linux-coverage.yml +++ b/.github/workflows/linux-coverage.yml @@ -6,6 +6,10 @@ on: - main pull_request: +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: coverage: runs-on: ubuntu-latest @@ -25,13 +29,10 @@ jobs: tar xf lcov-2.0.tar.gz cd lcov-2.0 make install - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: recursive set-safe-directory: true - - uses: n1hility/cancel-previous-runs@v2 - with: - token: ${{ secrets.GITHUB_TOKEN }} - run: | make -j 2 all pcsx-redux-tests make -C src/mips/openbios -j 2 diff --git a/.github/workflows/linux-cross.yml b/.github/workflows/linux-cross.yml index dd91d4bb7..dac199408 100644 --- a/.github/workflows/linux-cross.yml +++ b/.github/workflows/linux-cross.yml @@ -6,6 +6,10 @@ on: - main pull_request: +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: cross-arm64: runs-on: ubuntu-latest @@ -20,12 +24,9 @@ jobs: CXX: aarch64-linux-gnu-g++ --sysroot=/opt/cross/sysroot TEST_RESULTS: /tmp/test-results steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: recursive set-safe-directory: true - - uses: n1hility/cancel-previous-runs@v2 - with: - token: ${{ secrets.GITHUB_TOKEN }} - run: | make -j 2 all pcsx-redux-tests diff --git a/.github/workflows/linux-toolchain.yml b/.github/workflows/linux-toolchain.yml index ac8cb48d9..063e47742 100644 --- a/.github/workflows/linux-toolchain.yml +++ b/.github/workflows/linux-toolchain.yml @@ -6,17 +6,18 @@ on: - main pull_request: +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: toolchain: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: recursive set-safe-directory: true - - uses: n1hility/cancel-previous-runs@v2 - with: - token: ${{ secrets.GITHUB_TOKEN }} - name: Update packages registry run: sudo apt-get update - name: Install pre-reqs diff --git a/.github/workflows/macos-build.yml b/.github/workflows/macos-build.yml index c694e7c9b..d6e4b5d15 100644 --- a/.github/workflows/macos-build.yml +++ b/.github/workflows/macos-build.yml @@ -6,17 +6,18 @@ on: - main pull_request: +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: build-openbios: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: recursive set-safe-directory: true - - uses: n1hility/cancel-previous-runs@v2 - with: - token: ${{ secrets.GITHUB_TOKEN }} - name: Update packages run: sudo apt-get update - name: Install dependencies @@ -42,10 +43,7 @@ jobs: runs-on: macos-14 needs: build-openbios steps: - - uses: actions/checkout@v1 - - uses: n1hility/cancel-previous-runs@v2 - with: - token: ${{ secrets.GITHUB_TOKEN }} + - uses: actions/checkout@v4 - name: Install dependencies run: ./.github/scripts/install-brew-dependencies.sh - name: Fetch submodules @@ -137,10 +135,7 @@ jobs: needs: macos-arm-build-and-test if: github.event_name == 'push' steps: - - uses: actions/checkout@v1 - - uses: n1hility/cancel-previous-runs@v2 - with: - token: ${{ secrets.GITHUB_TOKEN }} + - uses: actions/checkout@v4 - name: Install node uses: actions/setup-node@v4 with: diff --git a/.github/workflows/macos-toolchain.yml b/.github/workflows/macos-toolchain.yml index ddaa4f8dd..6efddac98 100644 --- a/.github/workflows/macos-toolchain.yml +++ b/.github/workflows/macos-toolchain.yml @@ -6,19 +6,20 @@ on: - main pull_request: +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: macos-build-and-test-toolchain: runs-on: macOS-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: recursive set-safe-directory: true - - uses: n1hility/cancel-previous-runs@v2 - with: - token: ${{ secrets.GITHUB_TOKEN }} - name: install dependencies run: brew install --verbose nikitabobko/tap/brew-install-path - name: build mips binutils