Skip to content

Commit

Permalink
Test
Browse files Browse the repository at this point in the history
  • Loading branch information
Korne127 committed Aug 10, 2024
1 parent d85fbc6 commit 4b02091
Show file tree
Hide file tree
Showing 5 changed files with 133 additions and 13 deletions.
56 changes: 54 additions & 2 deletions .github/workflows/release_nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,46 @@ jobs:
CARGO_BUILD_DIR: target/${{ matrix.target }}/release

runs-on: ${{ matrix.os }}
# Use the oldest still-supported LTS to build the AppImage
container: ${{ startsWith(matrix.build_name, 'linux') && 'ubuntu:20.04' || null }}

steps:
# Necessary when using an Ubuntu container as it doesn't contain required shell tools
# TODO: Replace with AppImageDeploy container
- name: Install shell tools (Linux)
if: runner.os == 'Linux'
run: |
apt update
DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get -y install tzdata
apt install -y wget curl git gcc kmod sudo default-jre
git config --global --add safe.directory *
curl -sS https://webi.sh/gh | sh
echo $PATH
# ~/.local/bin/gh
# ~/.local/opt/gh-v2.54.0/bin/gh
echo "PATH=$PATH:$HOME/.local/bin" >> $GITHUB_ENV
ls ~/.local/bin
echo "HUI"
#ls usr/.local/bin
echo "HUI"
ls ~/.local/opt/gh-v2.54.0/bin
- name: GitHub CLI - Test
run: |
echo $home
echo "a"
realpath ~/.local/bin
echo "b"
echo "1"
echo $PATH
echo "hui"
ls ~/.local/bin
echo "hui"
~/.local/bin/gh --version
echo "OOO"
# . ~/.config/envman/PATH.env
gh --version
echo "2"
- name: Clone Ruffle repo
uses: actions/checkout@v4

Expand All @@ -119,7 +158,7 @@ jobs:
- name: Install Linux dependencies
if: runner.os == 'Linux'
run: |
sudo apt-get update
sudo apt update
sudo apt install -y libasound2-dev libxcb-shape0-dev libxcb-xfixes0-dev libgtk-3-dev libudev-dev
- name: Cargo build
Expand All @@ -140,10 +179,23 @@ jobs:
cp ${{ env.CARGO_BUILD_DIR }}/ruffle_desktop.exe package/ruffle.exe
7z a ${{ env.PACKAGE_FILE }} ./package/*
- name: Create an AppImage (Linux)
if: runner.os == 'Linux'
run: |
wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
chmod +x linuxdeploy-x86_64.AppImage
# TODO Update this after https://github.com/linuxdeploy/linuxdeploy/pull/288 gets merged
mkdir -p AppDir/usr/share
cp desktop/packaging/Linux/rs.ruffle.Ruffle.metainfo.xml AppDir/rs.ruffle.Ruffle.appdata.xml
cp package/* AppDir/usr/share
LDAI_OUTPUT="Ruffle.AppImage" ./linuxdeploy-x86_64.AppImage --appimage-extract-and-run -e ${{ env.CARGO_BUILD_DIR }}/ruffle_desktop -d desktop/packaging/Linux/rs.ruffle.Ruffle.desktop -i desktop/assets/icon.svg -i desktop/packaging/Linux/icon.png --appdir AppDir --output appimage
cp "Ruffle.AppImage" package
- name: Package Linux files
if: runner.os == 'Linux'
run: |
cp ${{ env.CARGO_BUILD_DIR }}/ruffle_desktop package/ruffle
# We must enter the package/ directory in order to create a flat tarball (i.e. without a directory in it).
cd package
tar -czvf ../${{ env.PACKAGE_FILE }} *
Expand Down
76 changes: 76 additions & 0 deletions desktop/assets/icon macOS.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 1 addition & 9 deletions desktop/assets/icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added desktop/packaging/Linux/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions desktop/packaging/Linux/rs.ruffle.Ruffle.desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Type=Application
Name=Ruffle
GenericName=Flash Player
Comment=Play Flash games & movies
Icon=rs.ruffle.Ruffle
Exec=ruffle %u
Icon=icon
Exec=ruffle_desktop
MimeType=application/x-shockwave-flash;application/vnd.adobe.flash.movie
Categories=Game;Utility;Graphics;AudioVideo;Player;Viewer
Keywords=flash;swf;player;emulator;rust

0 comments on commit 4b02091

Please sign in to comment.