Skip to content

Commit

Permalink
Build on 20.04 docker image (#53)
Browse files Browse the repository at this point in the history
  • Loading branch information
PeterJohnson authored May 17, 2023
1 parent 1451cd1 commit 2153d88
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 deletions.
30 changes: 15 additions & 15 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
build-sysroot-roborio-academic-cortexa9_vfpv3:
name: Build sysroot for roborio-academic-cortexa9_vfpv3
runs-on: ubuntu-latest
container: "docker.io/wpilib/opensdk-ubuntu:22.04"
container: "docker.io/wpilib/opensdk-ubuntu:20.04"
env:
WPI_TARGET: roborio-academic
WPI_TARGET_PORT: cortexa9_vfpv3
Expand All @@ -37,7 +37,7 @@ jobs:
build-sysroot-bullseye-armhf:
name: Build sysroot for bullseye-armhf
runs-on: ubuntu-latest
container: "docker.io/wpilib/opensdk-ubuntu:22.04"
container: "docker.io/wpilib/opensdk-ubuntu:20.04"
env:
WPI_TARGET: bullseye
WPI_TARGET_PORT: armhf
Expand All @@ -59,7 +59,7 @@ jobs:
build-sysroot-bullseye-arm64:
name: Build sysroot for bullseye-arm64
runs-on: ubuntu-latest
container: "docker.io/wpilib/opensdk-ubuntu:22.04"
container: "docker.io/wpilib/opensdk-ubuntu:20.04"
env:
WPI_TARGET: bullseye
WPI_TARGET_PORT: arm64
Expand All @@ -81,7 +81,7 @@ jobs:
build-sysroot-raspi-bullseye-armhf:
name: Build sysroot for raspi-bullseye-armhf
runs-on: ubuntu-latest
container: "docker.io/wpilib/opensdk-ubuntu:22.04"
container: "docker.io/wpilib/opensdk-ubuntu:20.04"
env:
WPI_TARGET: raspi-bullseye
WPI_TARGET_PORT: armhf
Expand Down Expand Up @@ -111,14 +111,14 @@ jobs:
{
os-cfg: linux_x86_64,
runner: ubuntu-latest,
container: "docker.io/wpilib/opensdk-ubuntu:22.04",
container: "docker.io/wpilib/opensdk-ubuntu:20.04",
testable: true,
},

{
os-cfg: windows_x86_64,
runner: ubuntu-latest,
container: "docker.io/wpilib/opensdk-ubuntu:22.04",
container: "docker.io/wpilib/opensdk-ubuntu:20.04",
testable: false,
},
{
Expand Down Expand Up @@ -189,14 +189,14 @@ jobs:
{
os-cfg: linux_x86_64,
runner: ubuntu-latest,
container: "docker.io/wpilib/opensdk-ubuntu:22.04",
container: "docker.io/wpilib/opensdk-ubuntu:20.04",
testable: true,
},

{
os-cfg: windows_x86_64,
runner: ubuntu-latest,
container: "docker.io/wpilib/opensdk-ubuntu:22.04",
container: "docker.io/wpilib/opensdk-ubuntu:20.04",
testable: false,
},
{
Expand Down Expand Up @@ -267,7 +267,7 @@ jobs:
{
os-cfg: windows_x86_64,
runner: ubuntu-latest,
container: "docker.io/wpilib/opensdk-ubuntu:22.04",
container: "docker.io/wpilib/opensdk-ubuntu:20.04",
testable: false,
},
{
Expand Down Expand Up @@ -338,7 +338,7 @@ jobs:
{
os-cfg: windows_x86_64,
runner: ubuntu-latest,
container: "docker.io/wpilib/opensdk-ubuntu:22.04",
container: "docker.io/wpilib/opensdk-ubuntu:20.04",
testable: false,
},
{
Expand Down Expand Up @@ -404,7 +404,7 @@ jobs:
needs: [build-sysroot-raspi-bullseye-armhf]
name: Build raspi-bullseye-armhf for linux_x86_64
runs-on: ubuntu-latest
container: "docker.io/wpilib/opensdk-ubuntu:22.04"
container: "docker.io/wpilib/opensdk-ubuntu:20.04"
env:
WPI_HOST: linux_x86_64
WPI_TARGET: raspi-bullseye
Expand All @@ -430,7 +430,7 @@ jobs:
needs: [build-sysroot-roborio-academic-cortexa9_vfpv3, build-platform-utils-raspi-bullseye-armhf-linux-x86_64]
name: Build roborio-academic-cortexa9_vfpv3 for raspi-bullseye_armhf
runs-on: ubuntu-latest
container: "docker.io/wpilib/opensdk-ubuntu:22.04"
container: "docker.io/wpilib/opensdk-ubuntu:20.04"
env:
WPI_HOST: raspi-bullseye_armhf
WPI_TARGET: roborio-academic
Expand Down Expand Up @@ -469,7 +469,7 @@ jobs:
needs: [build-sysroot-bullseye-arm64]
name: Build bullseye-arm64 for linux_x86_64
runs-on: ubuntu-latest
container: "docker.io/wpilib/opensdk-ubuntu:22.04"
container: "docker.io/wpilib/opensdk-ubuntu:20.04"
env:
WPI_HOST: linux_x86_64
WPI_TARGET: bullseye
Expand All @@ -495,7 +495,7 @@ jobs:
needs: [build-sysroot-roborio-academic-cortexa9_vfpv3, build-platform-utils-bullseye-arm64-linux-x86_64]
name: Build roborio-academic-cortexa9_vfpv3 for bullseye_arm64
runs-on: ubuntu-latest
container: "docker.io/wpilib/opensdk-ubuntu:22.04"
container: "docker.io/wpilib/opensdk-ubuntu:20.04"
env:
WPI_HOST: bullseye_arm64
WPI_TARGET: roborio-academic
Expand Down Expand Up @@ -544,4 +544,4 @@ jobs:
with:
allowUpdates: true
artifacts: "**/*"
token: ${{ secrets.GITHUB_TOKEN }}
token: ${{ secrets.GITHUB_TOKEN }}
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
build-sysroot-{{ target.os }}-{{ target.port }}:
name: Build sysroot for {{ target.os }}-{{ target.port }}
runs-on: ubuntu-latest
container: "docker.io/wpilib/opensdk-ubuntu:22.04"
container: "docker.io/wpilib/opensdk-ubuntu:20.04"
env:
WPI_TARGET: {{ target.os }}
WPI_TARGET_PORT: {{ target.port }}
Expand Down Expand Up @@ -45,14 +45,14 @@ jobs:
{
os-cfg: linux_x86_64,
runner: ubuntu-latest,
container: "docker.io/wpilib/opensdk-ubuntu:22.04",
container: "docker.io/wpilib/opensdk-ubuntu:20.04",
testable: true,
},
{% endif %}
{
os-cfg: windows_x86_64,
runner: ubuntu-latest,
container: "docker.io/wpilib/opensdk-ubuntu:22.04",
container: "docker.io/wpilib/opensdk-ubuntu:20.04",
testable: false,
},
{
Expand Down Expand Up @@ -118,7 +118,7 @@ jobs:
needs: [build-sysroot-{{ task.target.os }}-{{ task.target.port }}{% if task.host.os != "linux" or task.host.port != "x86_64" %}, build-platform-utils-{{ task.host.os }}-{{ task.host.port }}-linux-x86_64{% endif %}]
name: Build {{ task.target.os }}-{{ task.target.port }} for {{ task.host.os }}_{{ task.host.port }}
runs-on: ubuntu-latest
container: "docker.io/wpilib/opensdk-ubuntu:22.04"
container: "docker.io/wpilib/opensdk-ubuntu:20.04"
env:
WPI_HOST: {{ task.host.os }}_{{ task.host.port }}
WPI_TARGET: {{ task.target.os }}
Expand Down

0 comments on commit 2153d88

Please sign in to comment.