Use wildcards for uploading artifacts.

This commit is contained in:
Julian Groß 2025-05-31 22:06:55 +02:00
parent c7a2ce2b3a
commit 6368155aab
3 changed files with 8 additions and 10 deletions

View file

@ -156,14 +156,12 @@ jobs:
echo "${{ steps.buildenv1.outputs.symbols_archive }}"
if [ "${{ matrix.build_type }}" = "full" ]; then
if [[ "${{ matrix.os }}" = "Ubuntu"* ]]; then
echo "ARTIFACT_PATTERN=Overte-PR${{ github.event.number }}-${GIT_COMMIT_SHORT}-$(uname -m).$INSTALLER_EXT" >> $GITHUB_ENV
echo "ARTIFACT_NAME=Overte-PR${{ github.event.number }}-${GIT_COMMIT_SHORT}-$(uname -m).$INSTALLER_EXT" >> $GITHUB_ENV
else
echo "ARTIFACT_PATTERN=Overte-PR${{ github.event.number }}-${GIT_COMMIT_SHORT}.$INSTALLER_EXT" >> $GITHUB_ENV
echo "INSTALLER=Overte-$RELEASE_NUMBER-${GIT_COMMIT_SHORT}.$INSTALLER_EXT" >> $GITHUB_ENV
echo "ARTIFACT_NAME=Overte-PR${{ github.event.number }}-${GIT_COMMIT_SHORT}.$INSTALLER_EXT" >> $GITHUB_ENV
fi
else
echo "ARTIFACT_PATTERN=Overte-Interface-PR${{ github.event.number }}-${GIT_COMMIT_SHORT}.$INSTALLER_EXT" >> $GITHUB_ENV
echo "INSTALLER=Overte-Interface-$RELEASE_NUMBER-${GIT_COMMIT_SHORT}.$INSTALLER_EXT" >> $GITHUB_ENV
echo "ARTIFACT_NAME=Overte-Interface-PR${{ github.event.number }}-${GIT_COMMIT_SHORT}.$INSTALLER_EXT" >> $GITHUB_ENV
fi
- uses: actions/checkout@v4
@ -348,6 +346,6 @@ jobs:
- name: Upload Artifact
uses: actions/upload-artifact@v4
with:
name: ${{ env.ARTIFACT_PATTERN }}
path: ./build/${{ env.ARTIFACT_PATTERN }}
name: ${{ env.ARTIFACT_NAME }}
path: ./build/Overte-*
if-no-files-found: error

View file

@ -199,7 +199,7 @@ jobs:
uses: actions/upload-artifact@v4
with:
name: ${{ env.ARTIFACT_PATTERN }}
path: build/${{ env.ARTIFACT_PATTERN }}
path: build/Overte-*
if-no-files-found: error
- name: Archive symbols

View file

@ -1,6 +1,6 @@
# Copyright 2013-2019 High Fidelity, Inc.
# Copyright 2020 Vircadia contributors.
# Copyright 2022 Overte e.V.
# Copyright 2022-2025 Overte e.V.
# SPDX-License-Identifier: Apache-2.0
# Post build script
@ -18,7 +18,7 @@ def main():
release_number = os.environ['RELEASE_NUMBER']
full_prefix = upload_prefix + release_number
S3 = boto3.client('s3', region_name=os.environ['UPLOAD_REGION'], endpoint_url=os.environ['UPLOAD_ENDPOINT'])
path = os.path.join(os.getcwd(), os.environ['ARTIFACT_PATTERN'])
path = os.path.join(os.getcwd(), "Overte-*")
print("Checking for files to upload in {}..".format(path))
files = glob.glob(path, recursive=False)
for archiveFile in files: