Merge branch 'Next-Flip:dev' into dev

This commit is contained in:
Spooks
2024-03-10 13:21:34 -06:00
committed by GitHub
2 changed files with 2 additions and 5 deletions
+1 -1
View File
@@ -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 }}" \
+1 -4
View File
@@ -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("/", "_")