Skip to content

Commit 3799e07

Browse files
committed
try old runner
1 parent cd85198 commit 3799e07

File tree

2 files changed

+44
-61
lines changed

2 files changed

+44
-61
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -3,61 +3,8 @@ name: Project+ Dolphin Builder
33
on: [push, pull_request]
44

55
jobs:
6-
build_cleanup:
7-
runs-on: ubuntu-latest
8-
steps:
9-
-
10-
name: Check disk space
11-
run: df . -h
12-
-
13-
name: Free disk space
14-
run: |
15-
sudo docker rmi $(docker image ls -aq) >/dev/null 2>&1 || true
16-
sudo rm -rf \
17-
/usr/share/dotnet /usr/local/lib/android /opt/ghc \
18-
/usr/local/share/powershell /usr/share/swift /usr/local/.ghcup \
19-
/usr/lib/jvm || true
20-
echo "some directories deleted"
21-
sudo apt install aptitude -y >/dev/null 2>&1
22-
sudo aptitude purge aria2 ansible azure-cli shellcheck rpm xorriso zsync \
23-
esl-erlang firefox gfortran-8 gfortran-9 google-chrome-stable \
24-
google-cloud-sdk imagemagick \
25-
libmagickcore-dev libmagickwand-dev libmagic-dev ant ant-optional kubectl \
26-
mercurial apt-transport-https mono-complete libmysqlclient \
27-
unixodbc-dev yarn chrpath libssl-dev libxft-dev \
28-
libfreetype6 libfreetype6-dev libfontconfig1 libfontconfig1-dev \
29-
snmp pollinate libpq-dev postgresql-client powershell ruby-full \
30-
sphinxsearch subversion mongodb-org azure-cli microsoft-edge-stable \
31-
-y -f >/dev/null 2>&1
32-
sudo aptitude purge google-cloud-sdk -f -y >/dev/null 2>&1
33-
sudo aptitude purge microsoft-edge-stable -f -y >/dev/null 2>&1 || true
34-
sudo apt purge microsoft-edge-stable -f -y >/dev/null 2>&1 || true
35-
sudo aptitude purge '~n ^mysql' -f -y >/dev/null 2>&1
36-
sudo aptitude purge '~n ^php' -f -y >/dev/null 2>&1
37-
sudo aptitude purge '~n ^dotnet' -f -y >/dev/null 2>&1
38-
sudo apt-get autoremove -y >/dev/null 2>&1
39-
sudo apt-get autoclean -y >/dev/null 2>&1
40-
echo "some packages purged"
41-
-
42-
name: Check disk space
43-
run: |
44-
sudo dpkg-query -Wf '${Installed-Size}\t${Package}\n' | sort -nr | head
45-
df . -h
46-
sudo du /usr/ -hx -d 4 --threshold=1G | sort -hr | head
47-
-
48-
name: Checkout
49-
uses: actions/checkout@v3
50-
-
51-
name: Check working space directory
52-
run: du ${GITHUB_WORKSPACE} -h -d 1
53-
-
54-
name: Get more space
55-
run: |
56-
df . -h
57-
sudo rm -rf ${GITHUB_WORKSPACE}/.git
58-
df . -h
596
build_flatpak:
60-
runs-on: ubuntu-latest
7+
runs-on: ubuntu-20.04
618
container:
629
image: bilelmoussaoui/flatpak-github-actions:gnome-nightly
6310
options: --privileged
@@ -70,13 +17,6 @@ jobs:
7017
flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo && \
7118
flatpak install org.kde.Sdk//5.15 org.kde.Platform//5.15 -y && \
7219
dnf install libusb1-devel cmake git gcc-c++ libXext-devel libgudev qt6-qtbase-devel systemd-devel openal-soft-devel libevdev-devel libao-devel SOIL-devel libXrandr-devel pulseaudio-libs-devel bluez-libs-devel p7zip SDL2-devel make automake gcc gcc-c++ kernel-devel -y
73-
- name: Dolphin-Build Number
74-
run: |
75-
export LASTCOMMIT=$(git log --pretty=format:%H -1)
76-
export DOLPHINVER="v3.1.2-mainline-beta.2"
77-
echo "DOLPHIN Build $DOLPHINVER"
78-
echo "DOLPHINVER=$DOLPHINVER" >> $GITHUB_ENV
79-
sed -i "s|\${DOLPHIN_WC_DESCRIBE}|$DOLPHINVER|g" Source/Core/Common/scmrev.h.in
8020
- name: Run Flatpak Builder
8121
uses: flatpak/flatpak-github-actions/flatpak-builder@v6
8222
with:

Flatpak/dolphin-emu-wrapper

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,49 @@ for i in {0..9}; do
66
ln -sf {app/com.discordapp.Discord,$XDG_RUNTIME_DIR}/discord-ipc-$i;
77
done
88

9+
echo "Make directory /var/data/project-plus-dolphin/Wii if it doesn't exist"
10+
mkdir -p /var/data/project-plus-dolphin/Wii
11+
12+
echo "Make directory /var/config/project-plus-dolphin if it doesn't exist"
13+
mkdir -p /var/config/project-plus-dolphin
14+
15+
# Create and set variables for the system and user SD card creation dates
16+
# SystemSDCardCreationDate=`stat --format="%W" /app/share/project-plus-dolphin/sys/Load/WiiSD.raw`
17+
# UserSDCardCreationDate=`stat --format="%W" /var/data/project-plus-dolphin/Load/WiiSD.raw`
18+
19+
# echo "Check if there is a newer SD card version"
20+
# if [ $SystemSDCardCreationDate -gt ${UserSDCardCreationDate:=0} ];
21+
# then
22+
# echo "Make directory /var/data/project-plus-dolphin/Load if it doesn't exist"
23+
# mkdir -p /var/data/project-plus-dolphin/Load
24+
25+
# echo "Copy newer SD card to user data directory"
26+
# cp /app/share/project-plus-dolphin/sys/Load/WiiSD.raw /var/data/project-plus-dolphin/Load/WiiSD.raw
27+
# else
28+
# echo "SD card is already at latest version"
29+
# fi
30+
31+
echo "Copy dol files to user data directory if they don't already exist"
32+
cp -nr /app/share/project-plus-dolphin/sys/Wii/Launcher /var/data/project-plus-dolphin/Wii/
33+
34+
echo "Copy user directory to Flatpak user data directory (Overwritting any files already there with any newer files)"
35+
cp -ru /app/share/project-plus-dolphin/user /var/data/project-plus-dolphin/
36+
37+
# Create and set variables for the system and user HD textures creation dates
38+
SystemHDTexturesCreationDate=`stat --format="%W" /app/share/project-plus-dolphin/sys/Load/Textures/RSBE01`
39+
UserHDTexturesCreationDate=`stat --format="%W" /var/data/project-plus-dolphin/Load/Textures/RSBE01`
40+
41+
echo "Check if there are newer HD textures"
42+
if [ $SystemHDTexturesCreationDate -gt ${UserHDTexturesCreationDate:=0} ];
43+
then
44+
echo "Make directory /var/data/project-plus-dolphin/Load/Textures if it doesn't exist"
45+
mkdir -p /var/data/project-plus-dolphin/Load/Textures
46+
47+
echo "Copy newer HD textures to user data directory"
48+
cp -r /app/share/project-plus-dolphin/sys/Load/Textures/RSBE01 /var/data/project-plus-dolphin/Load/Textures
49+
else
50+
echo "HD textures are already at latest version"
51+
fi
952

1053
# Launch Dolphin and point it to the user directory
1154
project-plus-dolphin -u /var/data/project-plus-dolphin/user "$@"

0 commit comments

Comments
 (0)