fix release

jakzo · Jul 27, 2023 · af73779 · af73779
1 parent 937e1af
commit af73779
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 14 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -76,14 +76,14 @@ jobs:
         run: csi ./scripts/Release.csx "$GAME" "$PROJECT" "$VERSION_BUMP_TYPE" "$CHANGELOG_DESCRIPTION"
       - name: Build
         run: msbuild /property:Configuration=Release
-      - name: Upload to Thunderstore
-        if: steps.bump_version.outputs.release_thunderstore == 'true'
-        env:
-          GAME: ${{ matrix.changeset.game }}
-          PROJECT: ${{ matrix.changeset.project }}
-          NEW_VERSION: ${{ steps.bump_version.outputs.new_version }}
-          THUNDERSTORE_API_TOKEN: ${{ secrets.THUNDERSTORE_API_TOKEN }}
-        run: csi ./scripts/UploadThunderstore.csx "$GAME" "$PROJECT" "$NEW_VERSION"
+      # - name: Upload to Thunderstore
+      #   if: steps.bump_version.outputs.release_thunderstore == 'true'
+      #   env:
+      #     GAME: ${{ matrix.changeset.game }}
+      #     PROJECT: ${{ matrix.changeset.project }}
+      #     NEW_VERSION: ${{ steps.bump_version.outputs.new_version }}
+      #     THUNDERSTORE_API_TOKEN: ${{ secrets.THUNDERSTORE_API_TOKEN }}
+      #   run: csi ./scripts/UploadThunderstore.csx "$GAME" "$PROJECT" "$NEW_VERSION"
       - name: Copy LiveSplit build for commit
         if: steps.bump_version.outputs.release_livesplit == 'true'
         env:
@@ -103,7 +103,18 @@ jobs:
           git config --global user.email "github-actions[bot]@users.noreply.github.com"
           git add -A
           git commit -m "Release" --no-verify
-          git push --no-verify
+          for i in {1..3}; do
+            git fetch
+            if ! git rebase --autostash --no-verify; then
+              git rebase --abort
+              echo "Failed to rebase with main, probably due to git conflict. Manual fix required..."
+              exit 1
+            fi
+            if git push --no-verify; then
+              exit 0
+            fi
+          done
+          exit 1
       - name: Create release
         uses: softprops/action-gh-release@v1
         with:

diff --git a/docs/index.html b/docs/index.html
@@ -75,14 +75,17 @@ <h4>For PC:</h4>
           in your browser
           <ul>
             <li>
-              If recording with OBS you should instead add it to your scene directly by
-              adding a "Browser" source and using this for the URL:
+              If recording with OBS you should instead add it to your scene
+              directly by adding a "Browser" source and using this for the URL:
               <code>https://jakzo.github.io/SlzSpeedrunTools/input-viewer</code>
             </li>
           </ul>
         </li>
         <li>
-          The input viewer should automatically connect to the SpeedrunTimer mod
+          The input viewer should automatically connect to the
+          <a href="https://bonelab.thunderstore.io/package/jakzo/SpeedrunTimer/"
+            >SpeedrunTimer mod</a
+          >
           running on a game on the same computer (must be SpeedrunTimer v1.4.0
           or higher)
         </li>
@@ -141,8 +144,12 @@ <h4>For Quest or if viewing inputs from another PC:</h4>
           </ul>
         </li>
         <li>
-          The input viewer should connect to the SpeedrunTimer mod running at
-          the entered IP address (must be SpeedrunTimer v1.4.0 or higher)
+          The input viewer should connect to the
+          <a href="https://bonelab.thunderstore.io/package/jakzo/SpeedrunTimer/"
+            >SpeedrunTimer mod</a
+          >
+          running at the entered IP address (must be SpeedrunTimer v1.4.0 or
+          higher)
         </li>
       </ul>
       <h4>OBS tips:</h4>
@@ -151,6 +158,14 @@ <h4>OBS tips:</h4>
           You can use a color key filter in OBS to make the black background
           transparent
         </li>
+        <li>
+          The viewer looks best when it is square (width and height are the
+          same)
+        </li>
+        <li>
+          You can use the mouse + shift/control to move the input viewer camera
+          (but the default view should be fine for most people)
+        </li>
       </ul>
     </main>
   </body>