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.

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

Upgrade build image to 23.10. #1457

Merged
merged 3 commits into from
Nov 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 10 additions & 1 deletion .github/workflows/linux-coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,15 @@ jobs:
TEST_RESULTS: /tmp/test-results
BUILD: Coverage
steps:
- name: Update lcov, because https://bugs.launchpad.net/ubuntu/+source/lcov/+bug/2029924
run: |
apt install -y cpanminus
cpanm DateTime
cpanm Capture::Tiny
wget https://github.com/linux-test-project/lcov/releases/download/v2.0/lcov-2.0.tar.gz
tar xf lcov-2.0.tar.gz
cd lcov-2.0
make install
- uses: actions/checkout@v3
with:
submodules: recursive
Expand All @@ -34,5 +43,5 @@ jobs:
xvfb-run catchsegv ./pcsx-redux-tests
- name: Produce code coverage
run: |
lcov --directory . --capture --output-file coverage.info
lcov --ignore-errors mismatch --directory . --capture --output-file coverage.info
- uses: codecov/codecov-action@v2
22 changes: 11 additions & 11 deletions AppImageBuilder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@ AppDir:
apt:
arch:
- amd64
allow_unauthenticated: true
sources:
- sourceline: deb http://us.archive.ubuntu.com/ubuntu/ lunar main restricted
- sourceline: deb http://us.archive.ubuntu.com/ubuntu/ lunar-updates main restricted
- sourceline: deb http://us.archive.ubuntu.com/ubuntu/ lunar universe
- sourceline: deb http://us.archive.ubuntu.com/ubuntu/ lunar-updates universe
- sourceline: deb http://us.archive.ubuntu.com/ubuntu/ lunar multiverse
- sourceline: deb http://us.archive.ubuntu.com/ubuntu/ lunar-updates multiverse
- sourceline: deb http://us.archive.ubuntu.com/ubuntu/ lunar-backports main
- sourceline: deb http://us.archive.ubuntu.com/ubuntu/ mantic main restricted
key_url: https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x871920D1991BC93C
- sourceline: deb http://us.archive.ubuntu.com/ubuntu/ mantic-updates main restricted
- sourceline: deb http://us.archive.ubuntu.com/ubuntu/ mantic universe
- sourceline: deb http://us.archive.ubuntu.com/ubuntu/ mantic-updates universe
- sourceline: deb http://us.archive.ubuntu.com/ubuntu/ mantic multiverse
- sourceline: deb http://us.archive.ubuntu.com/ubuntu/ mantic-updates multiverse
- sourceline: deb http://us.archive.ubuntu.com/ubuntu/ mantic-backports main
restricted universe multiverse
- sourceline: deb http://security.ubuntu.com/ubuntu lunar-security main restricted
- sourceline: deb http://security.ubuntu.com/ubuntu lunar-security universe
- sourceline: deb http://security.ubuntu.com/ubuntu lunar-security multiverse
- sourceline: deb http://security.ubuntu.com/ubuntu mantic-security main restricted
- sourceline: deb http://security.ubuntu.com/ubuntu mantic-security universe
- sourceline: deb http://security.ubuntu.com/ubuntu mantic-security multiverse
include:
- libbz2-1.0:amd64
- libcom-err2:amd64
Expand Down
12 changes: 5 additions & 7 deletions tools/build/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Dockerfile for ghcr.io/grumpycoders/pcsx-redux-build

FROM ubuntu:22.10
FROM ubuntu:23.10

# The tzdata package isn't docker-friendly, and something pulls it.
ENV DEBIAN_FRONTEND noninteractive
Expand Down Expand Up @@ -44,16 +44,14 @@ RUN wget https://github.com/AppImage/AppImageKit/releases/download/continuous/ap
ln -s /opt/appimage-tool.AppDir/AppRun /usr/bin/appimagetool && \
rm /tmp/appimagetool-x86_64.AppImage
WORKDIR /
RUN pip3 install appimage-builder
RUN pip3 install --break-system-packages appimage-builder
RUN apt install -y imagemagick-6.q16 gtk-update-icon-cache appstream
ENV NVM_DIR /usr/local/nvm
ENV NODE_VERSION 14.17.0
RUN mkdir -p /usr/local/nvm
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.38.0/install.sh | bash \
&& . $NVM_DIR/nvm.sh \
&& nvm install $NODE_VERSION \
&& nvm alias default $NODE_VERSION \
&& nvm use default
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.38.0/install.sh | bash
RUN . $NVM_DIR/nvm.sh && nvm alias default $NODE_VERSION
RUN . $NVM_DIR/nvm.sh && nvm use default
RUN . $NVM_DIR/nvm.sh && npm install -g appcenter-cli
RUN apt install -y squashfs-tools zip zsync

Expand Down
Loading