From 1bc33f74c722f18fd1879de3984f8c44add50fa8 Mon Sep 17 00:00:00 2001
From: Goober5000 <ipw47@mailbox.org>
Date: Thu, 29 Aug 2024 14:52:23 -0400
Subject: [PATCH] try generating a nightly for 20240729

---
 .github/workflows/nightly_build.yml | 1 +
 git.py                              | 2 +-
 nightly.py                          | 5 +++--
 script_state.py                     | 4 ++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/nightly_build.yml b/.github/workflows/nightly_build.yml
index ee7a1ff..d5844c4 100644
--- a/.github/workflows/nightly_build.yml
+++ b/.github/workflows/nightly_build.yml
@@ -28,6 +28,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: scp-fs2open/fs2open.github.com
+          ref: 35db8e31c9b3e6faac5ad7ebcd9d3aedd0e508ab
           path: fs2open.github.com
           ssh-key: ${{ secrets.SIRKNIGHTLY_PRIVATE_KEY }}
           submodules: true
diff --git a/git.py b/git.py
index fc94dda..a829028 100644
--- a/git.py
+++ b/git.py
@@ -65,7 +65,7 @@ def update_repository(self):
         """
         self._git_redirected_success("checkout '{}'".format(self.branch))
         self._git_redirected_success("fetch --tags origin".format(self.branch))
-        self._git_redirected_success("reset --hard 'origin/{}'".format(self.branch))
+        self._git_redirected_success("reset --hard '{}'".format(self.branch))
 
     def prepare_repo(self):
         self._git_redirected_success("checkout '{}'".format(self.branch))
diff --git a/nightly.py b/nightly.py
index d98220b..c478c19 100644
--- a/nightly.py
+++ b/nightly.py
@@ -62,6 +62,7 @@ def get_source_version(config, date_version):
 class NightlyState(ScriptState):
     def __init__(self):
         super().__init__(config)
+        self.branch = "35db8e31c9b3e6faac5ad7ebcd9d3aedd0e508ab"
 
     def post_build_actions(self):
         # Get the file list
@@ -74,7 +75,7 @@ def post_build_actions(self):
         version = get_source_version(self.config, self.date.strftime(ScriptState.DATEFORMAT_VERSION))
         nebula.submit_release(nebula.render_nebula_release(version, "nightly", files, config), config)
 
-        commit = self.repo.get_commit()
+        commit = "35db8e31c9b3e6faac5ad7ebcd9d3aedd0e508ab"
         date = self.date.strftime(ScriptState.DATEFORMAT_FORUM)
         log = self.repo.get_log("nightly_*", self.tag_name)
 
@@ -84,7 +85,7 @@ def post_build_actions(self):
         return True
 
     def get_tag_name(self, params):
-        return "nightly_{date}_{commit}".format(**params)
+        return "nightly_20240729_35db8e31c"
 
     def get_tag_pattern(self):
         return "nightly_*"
diff --git a/script_state.py b/script_state.py
index d442a00..f13699f 100644
--- a/script_state.py
+++ b/script_state.py
@@ -50,7 +50,7 @@ def _go_to_state(self, state):
                 print("Latest commit already has a build tag!")
                 return ScriptState.STATE_FINISHED
 
-            self.date = datetime.datetime.now()
+            self.date = datetime.datetime(2024, 7, 29)
 
             format_args = {
                 "date": self.date.strftime(ScriptState.DATEFORMAT_VERSION),
@@ -72,7 +72,7 @@ def _go_to_state(self, state):
             if self.date is None:
                 # We are probably running with a tag that was already pushed in which case date has not been initialized
                 # yet
-                self.date = datetime.datetime.now()
+                self.date = datetime.datetime(2024, 7, 29)
 
             # Monitor the created build...
             self.success = build_monitor.monitor_builds(self.tag_name, self.config)