Skip to content

Commit

Permalink
try generating a nightly for 20240729
Browse files Browse the repository at this point in the history
  • Loading branch information
Goober5000 committed Aug 29, 2024
1 parent d52296a commit 1bc33f7
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
1 change: 1 addition & 0 deletions .github/workflows/nightly_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion git.py
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
5 changes: 3 additions & 2 deletions nightly.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)

Expand All @@ -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_*"
Expand Down
4 changes: 2 additions & 2 deletions script_state.py
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand All @@ -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)
Expand Down

0 comments on commit 1bc33f7

Please sign in to comment.