From 4ff9b391681c357b3614b9fda6fb9fe88b07a0ce Mon Sep 17 00:00:00 2001 From: R1kaB3rN <100738684+R1kaB3rN@users.noreply.github.com> Date: Tue, 8 Oct 2024 17:55:14 -0700 Subject: [PATCH 01/10] tests: add runtime update test --- tests/test_update.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 tests/test_update.sh diff --git a/tests/test_update.sh b/tests/test_update.sh new file mode 100644 index 000000000..646a27701 --- /dev/null +++ b/tests/test_update.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env sh + +mkdir -p $HOME/.local/share/umu + +curl -LJO "https://repo.steampowered.com/steamrt3/images/0.20240916.101795/SteamLinuxRuntime_sniper.tar.xz" +tar xaf SteamLinuxRuntime_sniper.tar.xz . +mv SteamLinuxRuntime_sniper/* $HOME/.local/share/umu +mv $HOME/.local/share/umu/_v2-entry-point $HOME/.local/share/umu/umu + +UMU_LOG=debug GAMEID=umu-0 umu-run wineboot -u From 534d6333818c9900fcc5cb096cc0e42a4e8cb92f Mon Sep 17 00:00:00 2001 From: R1kaB3rN <100738684+R1kaB3rN@users.noreply.github.com> Date: Tue, 8 Oct 2024 18:01:53 -0700 Subject: [PATCH 02/10] workflows: add initial runtime update tests to ci --- .github/workflows/e2e.yml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .github/workflows/e2e.yml diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml new file mode 100644 index 000000000..1e55176b2 --- /dev/null +++ b/.github/workflows/e2e.yml @@ -0,0 +1,32 @@ +name: e2e + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + +permissions: + contents: read + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Install dependencies + run: | + sudo apt-get install meson scdoc python3-hatchling python3-build python3-installer python3-filelock + - name: Initialize submodules + run: | + git submodule update --init --recursive + - name: Make system package + run: | + ./configure.sh --prefix=/usr + make DESTDIR=dist install + - name: Run tests + run: | + bash tests/test_update.sh From e8a13d0f1e4d8c26902e89f651ff169ff26f914d Mon Sep 17 00:00:00 2001 From: R1kaB3rN <100738684+R1kaB3rN@users.noreply.github.com> Date: Tue, 8 Oct 2024 18:05:57 -0700 Subject: [PATCH 03/10] tests: fix tar extract error --- tests/test_update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_update.sh b/tests/test_update.sh index 646a27701..afc070fe1 100644 --- a/tests/test_update.sh +++ b/tests/test_update.sh @@ -3,7 +3,7 @@ mkdir -p $HOME/.local/share/umu curl -LJO "https://repo.steampowered.com/steamrt3/images/0.20240916.101795/SteamLinuxRuntime_sniper.tar.xz" -tar xaf SteamLinuxRuntime_sniper.tar.xz . +tar xaf SteamLinuxRuntime_sniper.tar.xz mv SteamLinuxRuntime_sniper/* $HOME/.local/share/umu mv $HOME/.local/share/umu/_v2-entry-point $HOME/.local/share/umu/umu From be1606510922763a0f97deb0eb531236cb255cb6 Mon Sep 17 00:00:00 2001 From: R1kaB3rN <100738684+R1kaB3rN@users.noreply.github.com> Date: Tue, 8 Oct 2024 18:08:57 -0700 Subject: [PATCH 04/10] tests: specify absolute path --- tests/test_update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_update.sh b/tests/test_update.sh index afc070fe1..0fa871018 100644 --- a/tests/test_update.sh +++ b/tests/test_update.sh @@ -7,4 +7,4 @@ tar xaf SteamLinuxRuntime_sniper.tar.xz mv SteamLinuxRuntime_sniper/* $HOME/.local/share/umu mv $HOME/.local/share/umu/_v2-entry-point $HOME/.local/share/umu/umu -UMU_LOG=debug GAMEID=umu-0 umu-run wineboot -u +UMU_LOG=debug GAMEID=umu-0 /usr/bin/umu-run wineboot -u From a41f9cc011d885dca0c69aafbb8a07eb55b27be4 Mon Sep 17 00:00:00 2001 From: R1kaB3rN <100738684+R1kaB3rN@users.noreply.github.com> Date: Tue, 8 Oct 2024 18:09:12 -0700 Subject: [PATCH 05/10] workflows: install package in root --- .github/workflows/e2e.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 1e55176b2..9fd4021ad 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -26,7 +26,7 @@ jobs: - name: Make system package run: | ./configure.sh --prefix=/usr - make DESTDIR=dist install + sudo make install - name: Run tests run: | bash tests/test_update.sh From 0c1dfc4bb86e38f253a633698590f70d8f6375f1 Mon Sep 17 00:00:00 2001 From: R1kaB3rN <100738684+R1kaB3rN@users.noreply.github.com> Date: Tue, 8 Oct 2024 18:11:01 -0700 Subject: [PATCH 06/10] workflows: log the path --- .github/workflows/e2e.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 9fd4021ad..7136dc5d8 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -29,4 +29,5 @@ jobs: sudo make install - name: Run tests run: | + which umu-run bash tests/test_update.sh From 66fcb7ef17f29375fcbf725996dda5779c2dd251 Mon Sep 17 00:00:00 2001 From: R1kaB3rN <100738684+R1kaB3rN@users.noreply.github.com> Date: Tue, 8 Oct 2024 18:11:31 -0700 Subject: [PATCH 07/10] Revert "tests: specify absolute path" This reverts commit be1606510922763a0f97deb0eb531236cb255cb6. --- tests/test_update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_update.sh b/tests/test_update.sh index 0fa871018..afc070fe1 100644 --- a/tests/test_update.sh +++ b/tests/test_update.sh @@ -7,4 +7,4 @@ tar xaf SteamLinuxRuntime_sniper.tar.xz mv SteamLinuxRuntime_sniper/* $HOME/.local/share/umu mv $HOME/.local/share/umu/_v2-entry-point $HOME/.local/share/umu/umu -UMU_LOG=debug GAMEID=umu-0 /usr/bin/umu-run wineboot -u +UMU_LOG=debug GAMEID=umu-0 umu-run wineboot -u From 959f063c00eacb3f40da5425a360a24c8ad5f579 Mon Sep 17 00:00:00 2001 From: R1kaB3rN <100738684+R1kaB3rN@users.noreply.github.com> Date: Tue, 8 Oct 2024 18:15:16 -0700 Subject: [PATCH 08/10] workflows: perform user install --- .github/workflows/e2e.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 7136dc5d8..2e83f37b2 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -25,9 +25,8 @@ jobs: git submodule update --init --recursive - name: Make system package run: | - ./configure.sh --prefix=/usr - sudo make install + ./configure.sh --user-install + make install - name: Run tests run: | - which umu-run bash tests/test_update.sh From c937c94027f2bb23126e908388e8fbacace8d8ce Mon Sep 17 00:00:00 2001 From: R1kaB3rN <100738684+R1kaB3rN@users.noreply.github.com> Date: Tue, 8 Oct 2024 18:15:34 -0700 Subject: [PATCH 09/10] tests: refer to user install binary --- tests/test_update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_update.sh b/tests/test_update.sh index afc070fe1..eb4a0d142 100644 --- a/tests/test_update.sh +++ b/tests/test_update.sh @@ -7,4 +7,4 @@ tar xaf SteamLinuxRuntime_sniper.tar.xz mv SteamLinuxRuntime_sniper/* $HOME/.local/share/umu mv $HOME/.local/share/umu/_v2-entry-point $HOME/.local/share/umu/umu -UMU_LOG=debug GAMEID=umu-0 umu-run wineboot -u +UMU_LOG=debug GAMEID=umu-0 $HOME/.local/bin/umu-run wineboot -u From c8f58c6f192ace851f0c04ebc880084de1366054 Mon Sep 17 00:00:00 2001 From: R1kaB3rN <100738684+R1kaB3rN@users.noreply.github.com> Date: Tue, 8 Oct 2024 18:18:26 -0700 Subject: [PATCH 10/10] workflows: update workflow step name --- .github/workflows/e2e.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 2e83f37b2..2c8391dc1 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -23,7 +23,7 @@ jobs: - name: Initialize submodules run: | git submodule update --init --recursive - - name: Make system package + - name: Make user install run: | ./configure.sh --user-install make install