Pinback #4

.github/workflows/external_trigger.yml

@@ -29,8 +29,8 @@ jobs:
           echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
           echo "> External trigger running off of master branch. To disable this trigger, add \`rpcs3_master\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY
           printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY
-          EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/RPCS3/rpcs3-binaries-linux/releases/latest" | jq -r '. | .tag_name')
-          echo "Type is \`github_stable\`" >> $GITHUB_STEP_SUMMARY
+          EXT_RELEASE=$(echo v0.0.37-18156-6451c4d4)
+          echo "Type is \`custom_version_command\`" >> $GITHUB_STEP_SUMMARY
           if grep -q "^rpcs3_master_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
             echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
             echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` matches current external release; skipping trigger." >> $GITHUB_STEP_SUMMARY

Dockerfile

@@ -11,7 +11,8 @@ LABEL maintainer="thelamer"
 
 # title
 ENV TITLE=RPCS3 \
-    SDL_JOYSTICK_DEVICE=/dev/input/js0
+    SDL_JOYSTICK_DEVICE=/dev/input/js0 \
+    PIXELFLUX_WAYLAND=true
 
 RUN \
   echo "**** add icon ****" && \
@@ -23,7 +24,7 @@ RUN \
     | awk -F '(": "|")' '/browser.*AppImage/ {print $3}') && \
   curl -o \
     /tmp/rpcs3.app -L \
-    "${DOWNLOAD_URL}" && \
+    "https://github.com/RPCS3/rpcs3-binaries-linux/releases/download/build-6451c4d49fdf87380df65bd834d6582a1b6acde6/rpcs3-v0.0.37-18156-6451c4d4_linux64.AppImage" && \
   cd /tmp && \
   chmod +x rpcs3.app && \
   ./rpcs3.app --appimage-extract && \

Dockerfile.aarch64

@@ -11,7 +11,8 @@ LABEL maintainer="thelamer"
 
 # title
 ENV TITLE=RPCS3 \
-    SDL_JOYSTICK_DEVICE=/dev/input/js0
+    SDL_JOYSTICK_DEVICE=/dev/input/js0 \
+    PIXELFLUX_WAYLAND=true
 
 RUN \
   echo "**** add icon ****" && \
@@ -23,7 +24,7 @@ RUN \
     | awk -F '(": "|")' '/browser.*AppImage/ {print $3}') && \
   curl -o \
     /tmp/rpcs3.app -L \
-    "${DOWNLOAD_URL}" && \
+    "https://github.com/RPCS3/rpcs3-binaries-linux-arm64/releases/download/build-6451c4d49fdf87380df65bd834d6582a1b6acde6/rpcs3-v0.0.37-18156-6451c4d4_linux_aarch64.AppImage" && \
   cd /tmp && \
   chmod +x rpcs3.app && \
   ./rpcs3.app --appimage-extract && \

Jenkinsfile

@@ -145,23 +145,16 @@ pipeline {
     /* ########################
        External Release Tagging
        ######################## */
-    // If this is a stable github release use the latest endpoint from github to determine the ext tag
-    stage("Set ENV github_stable"){
-     steps{
-       script{
-         env.EXT_RELEASE = sh(
-           script: '''curl -H "Authorization: token ${GITHUB_TOKEN}" -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq -r '. | .tag_name' ''',
-           returnStdout: true).trim()
-       }
-     }
-    }
-    // If this is a stable or devel github release generate the link for the build message
-    stage("Set ENV github_link"){
-     steps{
-       script{
-         env.RELEASE_LINK = 'https://github.com/' + env.EXT_USER + '/' + env.EXT_REPO + '/releases/tag/' + env.EXT_RELEASE
-       }
-     }
+    // If this is a custom command to determine version use that command
+    stage("Set tag custom bash"){
+      steps{
+        script{
+          env.EXT_RELEASE = sh(
+            script: ''' echo v0.0.37-18156-6451c4d4 ''',
+            returnStdout: true).trim()
+            env.RELEASE_LINK = 'custom_command'
+        }
+      }
     }
     // Sanitize the release tag and strip illegal docker or github characters
     stage("Sanitize tag"){
@@ -1030,7 +1023,7 @@ pipeline {
                   "type": "commit",\
                   "tagger": {"name": "LinuxServer-CI","email": "ci@linuxserver.io","date": "'${GITHUB_DATE}'"}}'
               echo "Pushing New release for Tag"
-              curl -H "Authorization: token ${GITHUB_TOKEN}" -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq -r '. |.body' > releasebody.json
+              echo "Updating to ${EXT_RELEASE_CLEAN}" > releasebody.json
               jq -n \
                 --arg tag_name "$META_TAG" \
                 --arg target_commitish "master" \

README.md

@@ -612,6 +612,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **20.03.26:** - Pin back to latest v0.0.37 build to function, make Wayland default disable with PIXELFLUX_WAYLAND=false.
 * **20.12.25:** - Add Wayland init logic.
 * **22.09.25:** - Rebase to Debian Trixie.
 * **19.06.25:** - Initial release.

jenkins-vars.yml

@@ -2,7 +2,8 @@
 
 # jenkins variables
 project_name: docker-rpcs3
-external_type: github_stable
+external_type: na
+custom_version_command: "echo v0.0.37-18156-6451c4d4"
 release_type: stable
 release_tag: latest
 ls_branch: master

readme-vars.yml

@@ -107,6 +107,7 @@ init_diagram: |
   "rpcs3:latest" <- Base Images
 # changelog
 changelogs:
+  - {date: "20.03.26:", desc: "Pin back to latest v0.0.37 build to function, make Wayland default disable with PIXELFLUX_WAYLAND=false."}
   - {date: "20.12.25:", desc: "Add Wayland init logic."}
   - {date: "22.09.25:", desc: "Rebase to Debian Trixie."}
   - {date: "19.06.25:", desc: "Initial release."}