Skip to content

Commit 02b2b9d

Browse files
committed
test p1
1 parent 282c77d commit 02b2b9d

File tree

2 files changed

+3
-69
lines changed

2 files changed

+3
-69
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -56,29 +56,6 @@ jobs:
5656
df . -h
5757
sudo rm -rf ${GITHUB_WORKSPACE}/.git
5858
df . -h
59-
build_flatpak:
60-
runs-on: ubuntu-latest
61-
container:
62-
image: bilelmoussaoui/flatpak-github-actions:gnome-nightly
63-
options: --privileged
64-
steps:
65-
- uses: actions/checkout@v2
66-
- name: Purge .git for space reasons
67-
run: rm -rf /home/runner/work/Project-Plus-Dolphin-src/Project-Plus-Dolphin-src/.git
68-
- name: Setup Packages
69-
run: |
70-
flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo && \
71-
flatpak install org.kde.Sdk//5.15 org.kde.Platform//5.15 -y && \
72-
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
80-
- name: Run Flatpak Builder
81-
uses: flatpak/flatpak-github-actions/flatpak-builder@v6
82-
with:
83-
manifest-path: Distribution/flatpak/flatpak.yml
84-
bundle: Project-Plus-Dolphin-${{ env.DOLPHINVER }}.flatpak
59+
60+
61+

Flatpak/dolphin-emu-wrapper

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -6,49 +6,6 @@ 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
529

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

0 commit comments

Comments
 (0)