Merge branch 'Next-Flip:dev' into dev

Next-Flip · Mar 10, 2024 · e07f3f5 · e07f3f5
2 parents 8e97587 + 1f49d82
commit e07f3f5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -87,7 +87,7 @@ jobs:
           echo "ARTIFACT_TAG=$ARTIFACT_TAG" >> $GITHUB_ENV
 
       - name: "Upload artifacts to update server"
-        if: ${{ !github.event.pull_request.head.repo.fork }} && !contains(github.event.head_commit.message, '--nobuild')
+        if: ${{ !github.event.pull_request.head.repo.fork && !contains(github.event.head_commit.message, '--nobuild') }}
         run: |
           FILES=$(for ARTIFACT in $(find artifacts -maxdepth 1 -not -type d); do echo "-F files=@${ARTIFACT}"; done)
           curl --fail -L -H "Token: ${{ secrets.INDEXER_TOKEN }}" \

diff --git a/scripts/get_env.py b/scripts/get_env.py
@@ -60,10 +60,7 @@ def get_details(event, args):
     data["commit_sha"] = data["commit_hash"][:8]
     data["branch_name"] = re.sub("refs/\w+/", "", ref)
     data["suffix"] = (
-        "mntm-" +
-        data["branch_name"].replace("/", "_")
-        + "-"
-        + data["commit_sha"]
+        "mntm-" + data["branch_name"].replace("/", "_") + "-" + data["commit_sha"]
     )
     if ref.startswith("refs/tags/"):
         data["suffix"] = data["branch_name"].replace("/", "_")