Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ubuntu 22.04 to the build pipeline #1476

Merged
merged 2 commits into from
Jun 1, 2022
Merged

Add ubuntu 22.04 to the build pipeline #1476

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31de39d
Add Ubuntu 22.04 to the build pipeline
timo-a May 30, 2022
30ce824
Remove Ubuntu 20.04 from build instructions
timo-a May 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Add Ubuntu 22.04 to the build pipeline
  • Loading branch information
@timo-a @heinezen
timo-a authored and heinezen committed Jun 1, 2022
commit 31de39d33fc37e4440a50ca809ef5c65c6b821c6
8 changes: 4 additions & 4 deletions .github/workflows/ubuntu-21.04.yml → .github/workflows/ubuntu-22.04.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
name: Ubuntu 21.04 CI
name: Ubuntu 22.04 CI

on: [push, workflow_dispatch]

jobs:
build-devenv:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- name: Build the Docker image
run: sudo DOCKER_BUILDKIT=1 docker build ./docker/devenv --file ./docker/devenv/Dockerfile.ubuntu.2104 --tag openage-devenv:latest
run: sudo DOCKER_BUILDKIT=1 docker build ./docker/devenv --file ./docker/devenv/Dockerfile.ubuntu.2204 --tag openage-devenv:latest
shell: bash
- name: Save the Docker image
run: |
Expand All @@ -24,7 +24,7 @@ jobs:
retention-days: 30

build:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs: build-devenv
steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ Quickstart
Operating System | Build status
:------------------:|:--------------:
Debian Sid | [Todo: Kevin #11](https://github.com/SFTtech/kevin/issues/11)
Ubuntu 21.04 | [![Ubuntu 21.04 build status](https://github.com/SFTTech/openage/actions/workflows/ubuntu-21.04.yml/badge.svg?branch=master)](https://github.com/SFTtech/openage/actions/workflows/ubuntu-21.04.yml)
Ubuntu 22.04 LTS | [![Ubuntu 22.04 build status](https://github.com/SFTTech/openage/actions/workflows/ubuntu-22.04.yml/badge.svg?branch=master)](https://github.com/SFTtech/openage/actions/workflows/ubuntu-22.04.yml)
macOS | [![macOS build status](https://github.com/SFTtech/openage/workflows/macOS-CI/badge.svg)](https://github.com/SFTtech/openage/actions?query=workflow%3AmacOS-CI)
Windows 10 - x64 | [![Build status](https://ci.appveyor.com/api/projects/status/66sx35key94u740e?svg=true)](https://ci.appveyor.com/project/simonsan/openage-sl215)
Windows Server 2019 | [![Windows Server 2019 build status](https://github.com/SFTtech/openage/actions/workflows/windows-server-2019.yml/badge.svg?branch=master)](https://github.com/SFTtech/openage/actions/workflows/windows-server-2019.yml)
Expand Down
2 changes: 1 addition & 1 deletion docker/devenv/Dockerfile.ubuntu.2104 → docker/devenv/Dockerfile.ubuntu.2204
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:21.04
FROM ubuntu:22.04

RUN apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y sudo \
&& sudo apt-get update \
Expand Down