Skip to content

Commit

Permalink
Fix the deprecated runners (#371)
Browse files Browse the repository at this point in the history
* Update images 
* Update workflows
  • Loading branch information
vintagepc committed Aug 13, 2023
1 parent cad2a40 commit 0f0620a
Show file tree
Hide file tree
Showing 159 changed files with 90 additions and 87 deletions.
12 changes: 6 additions & 6 deletions .github/IWYU.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,23 +21,23 @@ jobs:
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- name: Checkout ${{ github.event.pull_request.head.ref }}
uses: actions/checkout@v2.2.0
uses: actions/checkout@v3
if: ${{ github.event.pull_request }}
with:
repository: vintagepc/MK404.git
ref: ${{ github.event.pull_request.head.sha }}
submodules: true

- name: Checkout ${{ github.event.ref }}
uses: actions/checkout@v2.2.0
uses: actions/checkout@v3
if: ${{ !github.event.pull_request }}
with:
repository: vintagepc/MK404.git
ref: ${{ github.event.ref }}
submodules: true

- name: Cache packages
uses: actions/cache@v1.0.3
uses: actions/cache@v3.0.11
id: cache-pkgs
with:
path: "packages"
Expand All @@ -48,7 +48,7 @@ jobs:

- name: Install packages
run: |
sudo apt-get update
sudo apt-get update
sudo apt-get purge clang-*
sudo apt-get -o Dir::Cache::Archives=`pwd`/packages install clang-5.0
sudo apt-get -o Dir::Cache::Archives=`pwd`/packages install libelf-dev gcc-avr libglew-dev freeglut3-dev libsdl-sound1.2-dev iwyu
Expand All @@ -63,9 +63,9 @@ jobs:
run: |
cd ${{ runner.workspace }}/MK404/build && make |& tee IWYU.txt
! grep -q "include-what-you-use reported diagnostics" IWYU.txt
- name: Upload IWYU log
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3.1.1
with:
name: IWYU
path: ${{ runner.workspace }}/MK404/build/IWYU.txt
28 changes: 14 additions & 14 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,23 @@ jobs:
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- name: Checkout ${{ github.event.pull_request.head.ref }}
uses: actions/checkout@v2.2.0
uses: actions/checkout@v3
if: ${{ github.event.pull_request }}
with:
repository: vintagepc/MK404.git
ref: ${{ github.event.pull_request.head.sha }}
submodules: true

- name: Checkout ${{ github.event.ref }}
uses: actions/checkout@v2.2.0
uses: actions/checkout@v3
if: ${{ !github.event.pull_request }}
with:
repository: vintagepc/MK404.git
ref: ${{ github.event.ref }}
submodules: true

- name: Cache packages
uses: actions/cache@v1.0.3
uses: actions/cache@v3.0.11
id: cache-pkgs
with:
path: "packages"
Expand All @@ -64,7 +64,7 @@ jobs:
run: cd ${{ runner.workspace }}/MK404/build && make -j2

- name: Checkout Wiki
uses: actions/checkout@v2.2.0
uses: actions/checkout@v3
if: ${{ !github.event.pull_request }}
with:
repository: vintagepc/MK404.wiki.git
Expand All @@ -89,7 +89,7 @@ jobs:
- name: Upload artifact
if: ${{ !github.event.pull_request }}
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3.1.1
with:
name: Binaries
path: ${{ runner.workspace }}/MK404/build/MK404-development-build.tar.bz2
Expand All @@ -102,15 +102,15 @@ jobs:
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- name: Checkout ${{ github.event.pull_request.head.ref }}
uses: actions/checkout@v2.2.0
uses: actions/checkout@v3
if: ${{ github.event.pull_request }}
with:
repository: vintagepc/MK404.git
ref: ${{ github.event.pull_request.head.sha }}
submodules: true

- name: Checkout ${{ github.event.ref }}
uses: actions/checkout@v2.2.0
uses: actions/checkout@v3
if: ${{ !github.event.pull_request }}
with:
repository: vintagepc/MK404.git
Expand All @@ -133,7 +133,7 @@ jobs:
- name: Upload OSX artifact
if: ${{ !github.event.pull_request }}
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3.1.1
with:
name: Binaries
path: ${{ runner.workspace }}/MK404/build/MK404_OSX
Expand All @@ -143,14 +143,14 @@ jobs:
runs-on: windows-latest
if: "!contains(github.event.head_commit.message, 'NO_BUILD')"
steps:
- uses: actions/cache@v1
- uses: actions/cache@v3.0.11
with:
path: C:\tools\chococache
key: ${{ runner.os }}-cygwin-${{ github.sha }}
restore-keys: |
${{ runner.os }}-cygwin-
- name: Cygwin package cache
uses: actions/cache@v1
uses: actions/cache@v3.0.11
with:
path: C:\tools\cygcache
key: ${{ runner.os }}-cygwinpkgs-1_1
Expand All @@ -166,15 +166,15 @@ jobs:
shell: cmd

- name: Checkout ${{ github.event.pull_request.head.ref }}
uses: actions/checkout@v2.2.0
uses: actions/checkout@v3
if: ${{ github.event.pull_request }}
with:
repository: vintagepc/MK404.git
ref: ${{ github.event.pull_request.head.sha }}
submodules: true

- name: Checkout ${{ github.event.ref }}
uses: actions/checkout@v2.2.0
uses: actions/checkout@v3
if: ${{ !github.event.pull_request }}
with:
repository: vintagepc/MK404.git
Expand All @@ -201,7 +201,7 @@ jobs:

- name: Upload Cygwin artifact
if: ${{ !github.event.pull_request }}
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3.1.1
with:
name: Binaries
path: ${{ runner.workspace }}/MK404/build/MK404.exe
Expand All @@ -212,7 +212,7 @@ jobs:
needs: [build, build_osx, build_cygwin]
steps:
- name: Retrieve platform binaries
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3.1.1
with:
name: Binaries

Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/cppcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,29 +15,29 @@ jobs:
# This workflow contains a single job called "build"
cppcheck:
# The type of runner that the job will run on
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- name: Checkout ${{ github.event.pull_request.head.ref }}
uses: actions/checkout@v2.2.0
uses: actions/checkout@v3
if: ${{ github.event.pull_request }}
with:
repository: vintagepc/MK404.git
ref: ${{ github.event.pull_request.head.sha }}
submodules: true

- name: Checkout ${{ github.event.ref }}
uses: actions/checkout@v2.2.0
uses: actions/checkout@v3
if: ${{ !github.event.pull_request }}
with:
repository: vintagepc/MK404.git
ref: ${{ github.event.ref }}
submodules: true

- name: Cache packages
uses: actions/cache@v1.0.3
uses: actions/cache@v3.0.11
id: cache-pkgs
with:
path: "packages"
Expand All @@ -50,7 +50,7 @@ jobs:
run: |
sudo apt-get update
sudo apt-get purge clang-*
sudo apt-get -o Dir::Cache::Archives=`pwd`/packages install clang-5.0 clang-tidy-5.0
sudo apt-get -o Dir::Cache::Archives=`pwd`/packages install clang-6.0 clang-tidy-6.0
sudo apt-get -o Dir::Cache::Archives=`pwd`/packages install libelf-dev gcc-avr libglew-dev freeglut3-dev libsdl-sound1.2-dev iwyu cppcheck
- name: Cache permissions
Expand All @@ -70,7 +70,7 @@ jobs:
make -j2 |& tee tidy.txt
- name: Upload clang-tidy log
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3.1.1
with:
name: warnings
path: ${{ runner.workspace }}/MK404/build/tidy.txt
Expand Down
Loading

0 comments on commit 0f0620a

Please sign in to comment.