Merge pull request 'Make CI/CD worko properly' (#230) from renkitfix into master

Reviewed-on: Cavemanon/SnootGame#230

.android.json

@@ -0,0 +1 @@
+{"expansion": false, "heap_size": "3", "icon_name": "Snoot Game", "include_pil": false, "include_sqlite": false, "layout": null, "name": "Snoot Game", "numeric_version": 1, "orientation": "sensorLandscape", "package": "cavemanon.snootgame", "permissions": ["VIBRATE", "INTERNET"], "source": false, "store": "none", "update_always": true, "update_icons": true, "update_keystores": true, "version": "9.0"}

.gitignore

@@ -51,7 +51,4 @@ env
 *.rpymc
 
 #backups
-*.bak
-
-#android
-.android.json
+*.bak

.woodpecker.yml

@@ -0,0 +1,78 @@
+steps:
+  changelog:
+      image: debian
+      commands:
+        - apt update
+        - apt install git -y
+        - mkdir dist
+        - git log --oneline --decorate --since="7.days" --pretty="## %s%n%an%n%aD%n%b" > dist/README.md || echo "Could not write changelog!" >> dist/README.md #Get that changelog
+
+  version-tag:
+    image: debian
+    commands:
+      - sed -i -e "s/INTERNAL-BUILD/${CI_COMMIT_TAG}/g" game/options.rpy #Change the internal build name to the tagged version
+    when:
+      - event: tag
+  
+  version-cron:
+    image: debian
+    commands:
+      - sed -i -e "s/INTERNAL-BUILD/${CI_COMMIT_SHA}/g" game/options.rpy #if no tag, make it the commit num
+    when:
+      - event: cron
+
+  build:
+    image: openjdk:8
+    commands:
+      - apt update
+      - apt install libgl1 -y
+      - sed -i -e "s/VERSION/${RenpyVersion}/g" game/options.rpy #Change the renpy version to the woodpecker reuqested one.
+        #Get Renkit
+      - wget -qO- "https://github.com/kobaltcore/renkit/releases/download/v${RenkitVersion}/renkit-linux-amd64.tar.gz" | tar xz --directory=/tmp/
+      - /tmp/renconstruct build -i "." -c "renconstruct.toml" -o dist/
+      - cd /tmp/
+
+  archival-sha:
+    image: debian
+    commands:
+      - apt update
+      - apt install curl bash -y
+      - curl https://git.cavemanon.xyz/Cavemanon/Woodpecker-Webdav/raw/branch/master/push.sh > /tmp/push.sh ## I'd use a proper docker container, but dockerhub is owned by the CIA and I refuse to deal with that (also I don't care to maintain it or set it up). #TODO: merge this script as apart of the file so we don't make unnecessary network requests every time we build.
+      - chmod +x /tmp/push.sh
+      - PLUGIN_USERNAME=$RELEASESMITHNEXTCLOUDUSERNAME PLUGIN_PASSWORD=$RELEASESMITHNEXTCLOUDPASSWORD PLUGIN_DESTINATION=https://cloud.dev.cavemanon.xyz/remote.php/dav/files/ReleaseSmith/Snoot%20Game/Internal%20Builds/nightly-${CI_COMMIT_SHA}/ PLUGIN_MAKE_FOLDER_AT=https://cloud.dev.cavemanon.xyz/remote.php/dav/files/ReleaseSmith/Snoot%20Game/Internal%20Builds/nightly-${CI_COMMIT_SHA}/ PLUGIN_FILE_GLOB=dist/* /tmp/push.sh #sovl
+      - rm -rf "dist"
+    secrets: [ releasesmithnextcloudusername, releasesmithnextcloudpassword ]
+    when:
+      - event: cron
+        cron: "nightly"
+  
+  archival-tag:
+    image: debian
+    commands:
+      - apt update
+      - apt install curl bash -y
+      - curl https://git.cavemanon.xyz/Cavemanon/Woodpecker-Webdav/raw/branch/master/push.sh > /tmp/push.sh ## I'd use a proper docker container, but dockerhub is owned by the CIA and I refuse to deal with that (also I don't care to maintain it or set it up). #TODO: merge this script as apart of the file so we don't make unnecessary network requests every time we build.
+      - chmod +x /tmp/push.sh
+      - PLUGIN_USERNAME=$RELEASESMITHNEXTCLOUDUSERNAME PLUGIN_PASSWORD=$RELEASESMITHNEXTCLOUDPASSWORD PLUGIN_DESTINATION=https://cloud.dev.cavemanon.xyz/remote.php/dav/files/ReleaseSmith/Snoot%20Game/Internal%20Builds/release-${CI_COMMIT_TAG}/ PLUGIN_MAKE_FOLDER_AT=https://cloud.dev.cavemanon.xyz/remote.php/dav/files/ReleaseSmith/Snoot%20Game/Internal%20Builds/release-${CI_COMMIT_TAG}/ PLUGIN_FILE_GLOB=dist/* /tmp/push.sh #sovl
+      - rm -rf "dist"
+    secrets: [ releasesmithnextcloudusername, releasesmithnextcloudpassword ]
+    when:
+      - event: tag
+
+  release:
+    image: woodpeckerci/plugin-gitea-release:latest
+    settings:
+      base_url: https://git.cavemanon.xyz
+      api_key:
+        from_secret: releasesmithapikey
+      files: "*-dists/*"
+      prerelease: true
+      title: "${CI_COMMIT_TAG}"
+    when:
+      - event: tag
+
+matrix:
+  RenpyVersion:
+    - "8.0.3"
+  RenkitVersion:
+    - "3.3.1"

game/options.rpy

@@ -24,7 +24,7 @@ define gui.show_name = True
 
 ## The version of the game.
 
-define config.version = _("Patch9_RoastedLaika")
+define config.version = _("INTERNAL-BUILD")
 
 ## Text that is placed on the game's about screen. Place the text between the
 ## triple-quotes, and leave a blank line between paragraphs.

game/screens.rpy

@@ -437,8 +437,7 @@ screen bonus_chapter_button(f="gui/button/menubuttons/template_idle.png"):
         action ShowMenu("ex_ch_menu")
         activate_sound "audio/ui/uiClick.wav"
         fixed:
-            if (persistent.old_endings != persistent.endings) \
-                or (persistent.bonus_chapters != persistent.old_bonus_chapters and (persistent.bonus_chapters == 0b111111111)):
+            if (persistent.old_endings != persistent.endings) or (persistent.bonus_chapters != persistent.old_bonus_chapters and (persistent.bonus_chapters == 0b111111111)):
                 add "bonus_flash" xalign 0.5 yalign 0.5 zoom 1 xanchor 0 xcenter 0.5 ycenter 0.5
                 $ persistent.old_endings = persistent.endings
                 #$ persistent.old_bonus_chapters = persistent.bonus_chapters
@@ -479,8 +478,7 @@ screen main_menu():
             pass
 
 
-    if (persistent.old_endings != persistent.endings) \
-        or (persistent.bonus_chapters != persistent.old_bonus_chapters and (persistent.bonus_chapters == 0b111111111)):
+    if (persistent.old_endings != persistent.endings) or (persistent.bonus_chapters != persistent.old_bonus_chapters and (persistent.bonus_chapters == 0b111111111)):
         fixed:
             xalign 0.125
             yalign 0.5

renconstruct.toml

@@ -0,0 +1,51 @@
+[tasks.clean]
+  enabled = false
+  priorities = { post_build = 0 } # the priority that determines the orders tasks will run in, defaults to 0
+  on_builds = ["pc", "win", "linux", "mac", "web", "steam", "market", "android_apk", "android_aab"] # builds this task should run for, defaults to all available builds
+
+[tasks.notarize] # required if matching task is enabled
+  enabled = false
+  priorities = { post_build = 10 } # the priority that determines the orders tasks will run in, defaults to 10
+  on_builds = ["mac"] # builds this task should run for, defaults to "mac"
+  bundle_identifier = "com.my-game" # the bundle ID of your came, typically in reverse domain notation
+  key_file = "certificates/private-key.pem" # the path to the private key file generated during the provisioning process
+  cert_file = "certificates/developerID_application.cer" # the path to the Apple-generated certificate file generated during the provisioning process
+  app_store_key_file = "certificates/app-store-key.json" # the path to the combined App Store key file generated during the provisioning process
+  json_bundle_file = "certificates/renotize.json" # the path to the combined certificate file. replaces the key, cert and app store files above
+
+[tasks.keystore] # required if matching task is enabled
+  enabled = false
+  priorities = { pre_build = 0 } # the priority that determines the orders tasks will run in, defaults to 0
+  on_builds = ["android_apk", "android_aab"] # builds this task should run for, defaults to all android builds
+  keystore_apk = "<base64-encoded keystore file>" # the base-64 encoded binary keystore file for the APK bundles
+  keystore_aab = "<base64-encoded keystore file>" # the base-64 encoded binary keystore file for the AAB bundles
+
+[tasks.convert_images]
+  enabled = false
+  format = "webp" # webp or avif
+  priorities = { pre_build = 10 } # the priority that determines the orders tasks will run in, defaults to 10
+  on_builds = ["pc", "win", "linux", "mac", "web", "steam", "market", "android_apk", "android_aab"] # builds this task should run for, defaults to all available builds
+  # extensions: a list of file extensions to convert
+  # recursive: scans directories recursively if enabled, otherwise only scans the immediate directory
+  # lossless: converts to lossless WebP if enabled, otherwise converts to lossy WebP
+  "game/images/cg" = { extensions = ["png", "jpg"], recursive = true, lossless = true } # default values
+  "game/images/bg" = { lossless = false }
+  "game/images" = { } # all parameters are optional
+
+[build] # required, at least one item must be 'true'
+  #pc = true  # windows + linux
+  win = true # windows
+  linux = true # linux
+  mac = true # macos
+  #web = false # web
+  #steam = true # steam
+  #market = true # multiple markets (i.e. itch.io)
+  android_apk = true # Android Universal APK
+  #android_aab = false # Android Play Store Bundle
+
+[options]
+  clear_output_dir = false # whether to clear the output directory on startup
+
+[renutil]
+  version = "8.0.3" # the Ren'Py version to use (required)
+  registry = "tmp/cache" # the directory to store installation files in