Skip to content

Commit c50feb8

Browse files
committed
Merge main branch and resolve conflicts while maintaining EOL platform removal
2 parents 59823b2 + 3da9f4e commit c50feb8

File tree

3 files changed

+27
-5
lines changed

3 files changed

+27
-5
lines changed
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: C/C++ CI on Ubuntu 20.04
1+
name: C/C++ CI on Ubuntu 22.04
22

33
on:
44
push:
@@ -28,11 +28,11 @@ jobs:
2828
strategy:
2929
matrix:
3030
config: [release, debug]
31-
os: [ubuntu-20.04]
31+
os: [ubuntu-22.04]
3232

3333
steps:
3434
- name: Checkout
3535
uses: actions/checkout@v1
3636
continue-on-error: true
3737
- name: Test ${{ matrix.os }} ${{ matrix.config }}
38-
run: ./build-tests.sh ${{ matrix.config }}
38+
run: ./build-tests.sh ${{ matrix.config }}

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ Other resources to learn how to setup the build system:
6666
| Operating System | Compiler |
6767
| ----------------------------- | -------------------------------- |
6868
| macOS 10.15+ | Clang Xcode 12.0+ |
69-
| Ubuntu 20.04 LTS | GCC 9.x.x |
69+
| Ubuntu 20.04 LTS | GCC 9.x.x |
7070
| Ubuntu 22.04 LTS | GCC 11.x.x |
7171
| Windows 10 | Android Studio/Gradle |
7272
| Windows Server 2016 | Visual Studio 2017 (vc141) |
@@ -83,7 +83,7 @@ Other resources to learn how to setup the build system:
8383
| macOS 10.15+ | :white_check_mark: | |
8484
| macOS (latest) | :white_check_mark: | :white_check_mark: |
8585
| Ubuntu 20.04.x LTS | :white_check_mark: | :white_check_mark: |
86-
| Ubuntu 22.04.x LTS | :white_check_mark: | |
86+
| Ubuntu 22.04.x LTS | :white_check_mark: | :white_check_mark: |
8787
| Ubuntu (latest) | :white_check_mark: | :white_check_mark: |
8888
| Windows 10.x | :white_check_mark: | |
8989
| Windows 11 | :white_check_mark: | |

docker/ubuntu22.04/Dockerfile

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
FROM ubuntu:22.04
2+
3+
ENV DEBIAN_FRONTEND noninteractive
4+
5+
# Package installation
6+
RUN apt-get update
7+
8+
## Common packages for linux build environment
9+
RUN apt install -y clang python3 pkg-config git curl nghttp2 bzip2 unzip make wget cmake sudo
10+
11+
RUN adduser --disabled-password --gecos '' docker
12+
RUN adduser docker sudo
13+
RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
14+
## RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
15+
## USER docker
16+
17+
# this is where I was running into problems with the other approaches
18+
RUN sudo apt-get update
19+
20+
CMD /bin/bash
21+
22+
# ENTRYPOINT bash

0 commit comments

Comments
 (0)