diff --git a/.github/workflows/nightly_build.yml b/.github/workflows/nightly_build.yml index 90d9304..2b7f13a 100644 --- a/.github/workflows/nightly_build.yml +++ b/.github/workflows/nightly_build.yml @@ -28,7 +28,7 @@ jobs: uses: actions/checkout@v2 with: repository: scp-fs2open/fs2open.github.com - ref: 8dc1ffea94c8d071f71f4122b5564b0a598c735b + ref: 4cbd84d59e6f8ca8d15382fa6809282117449ded path: fs2open.github.com ssh-key: ${{ secrets.SIRKNIGHTLY_PRIVATE_KEY }} submodules: true diff --git a/git.py b/git.py index 0e4bb0f..888c8b4 100644 --- a/git.py +++ b/git.py @@ -6,7 +6,7 @@ class GitRepository: def __init__(self, path, branch): - self.branch = "8dc1ffea94c8d071f71f4122b5564b0a598c735b" + self.branch = "4cbd84d59e6f8ca8d15382fa6809282117449ded" self.path = path def _format_git_cmd(self, cmd): diff --git a/nightly.py b/nightly.py index 331ddd9..035fdcd 100644 --- a/nightly.py +++ b/nightly.py @@ -62,7 +62,7 @@ def get_source_version(config, date_version): class NightlyState(ScriptState): def __init__(self): super().__init__(config) - self.branch = "8dc1ffea94c8d071f71f4122b5564b0a598c735b" + self.branch = "4cbd84d59e6f8ca8d15382fa6809282117449ded" def post_build_actions(self): # Get the file list @@ -75,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 = "8dc1ffea94c8d071f71f4122b5564b0a598c735b" + commit = "4cbd84d59e6f8ca8d15382fa6809282117449ded" date = self.date.strftime(ScriptState.DATEFORMAT_FORUM) log = self.repo.get_log("nightly_*", self.tag_name) @@ -85,7 +85,7 @@ def post_build_actions(self): return True def get_tag_name(self, params): - return "nightly_20240812_8dc1ffea9" + return "nightly_20240813_4cbd84d59" def get_tag_pattern(self): return "nightly_*" diff --git a/script_state.py b/script_state.py index dc66f3f..17e41a8 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(2024, 8, 12) + self.date = datetime.datetime(2024, 8, 13) 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(2024, 8, 12) + self.date = datetime.datetime(2024, 8, 13) # Monitor the created build... self.success = build_monitor.monitor_builds(self.tag_name, self.config)