Merge branch 'main' into RodoMa92-update-pnpm-to-latest

SteamDeckHomebrew · Jul 16, 2024 · 6ae8d1e · 6ae8d1e
2 parents 347b25d + ff7e0eb
commit 6ae8d1e
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/build-builder.yml b/.github/workflows/build-builder.yml
@@ -3,8 +3,6 @@ name: Build Builder Docker image
 on:
   workflow_dispatch:
   push:
-    branches:
-      - main
     paths:
       - "builder/**"
       - ".github/workflows/build-builder.yml"
@@ -16,11 +14,12 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
     - name: Login to GitHub Container Registry
+      if: ${{ (github.ref == 'refs/heads/main' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch')) }}
       run: |
         echo $GITHUB_TOKEN | docker login ghcr.io -u SteamDeckHomebrew --password-stdin
       env:
@@ -32,11 +31,12 @@ jobs:
         docker build -t ghcr.io/steamdeckhomebrew/builder:latest .
 
     - name: Wait for other runs to complete
-      uses: softprops/turnstyle@8db075d65b19bf94e6e8687b504db69938dc3c65
+      uses: softprops/turnstyle@v2
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Push
+      if: ${{ (github.ref == 'refs/heads/main' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch')) }}
       run: |
         docker push ghcr.io/steamdeckhomebrew/builder:latest
 

diff --git a/.github/workflows/build-plugins.yml b/.github/workflows/build-plugins.yml
@@ -313,7 +313,7 @@ jobs:
         SUBMIT_AUTH_KEY: ${{ secrets.SUBMIT_AUTH_KEY }}
         STORE_URL: ${{ secrets.STORE_URL }}
         upload: ${{ matrix.upload }}
-      if: ${{ matrix.upload == true && env.SUBMIT_AUTH_KEY != '' }}
+      if: ${{ matrix.upload == true && inputs.test_build != true && env.SUBMIT_AUTH_KEY != '' }}
       run: |
         shopt -s dotglob
 

diff --git a/builder/Dockerfile b/builder/Dockerfile
@@ -1,8 +1,8 @@
-FROM node:18-alpine
+FROM node:20-alpine
 
 RUN apk add --no-cache rsync
 
-RUN npm i --location=global pnpm@9.4.0
+RUN npm i --location=global pnpm@9
 
 COPY ./entrypoint.sh /entrypoint.sh
 

diff --git a/plugins/Junk-Store b/plugins/Junk-Store
diff --git a/plugins/SDH-CssLoader b/plugins/SDH-CssLoader
diff --git a/plugins/TabMaster b/plugins/TabMaster
diff --git a/plugins/decky-XRGaming b/plugins/decky-XRGaming
diff --git a/plugins/decky-brightness-bar b/plugins/decky-brightness-bar
diff --git a/plugins/moondeck b/plugins/moondeck
+2 −2		defaults/scripts/Extensions/Epic/settings.sh
+4 −4		defaults/scripts/Extensions/Epic/store.sh
+4 −1		defaults/scripts/epic.py
+53 −50		main.py
+1 −1		package.json
+1 −1		css_inject.py
+1 −1		css_theme.py
+16 −5		main.py
+1 −1		package.json
+2 −13		README.md
+1 −1		defaults/PyXRLinuxDriverIPC
+8 −6		package.json
+5 −0		CHANGELOG.md
+1 −1		package.json
+47 −14		src/lib/components/brightness_bar.tsx
+2 −1		src/lib/components/qam_content.tsx
+2 −2		defaults/python/lib/buddyclient.py
+1 −1		defaults/python/lib/constants.py
+3 −2		defaults/python/lib/hostinfo.py
+6 −1		defaults/python/lib/settings.py
+1 −1		package.json
+10 −0		src/components/buttonstyleview/buttonstyleview.tsx
+12 −0		src/components/changelogview/changelogview.tsx
+1 −0		src/components/moondecklaunchbutton/containerstyle.tsx
+4 −3		src/components/sunshineappsview/sunshineappsview.tsx
+26 −14		src/components/sunshineappsview/syncbutton.tsx
+1 −0		src/lib/settingsmanager.ts
+4 −1		src/steam-utils/collectionStoreInvalidation.ts
+1 −1		src/steam-utils/getCollectionStore.ts