From b4bd0d9cad6cd2503b2660d7a83c42d60e024a10 Mon Sep 17 00:00:00 2001 From: Jonathan Linat Date: Fri, 23 Feb 2024 16:43:35 -0500 Subject: [PATCH] Continuous Building --- .github/workflows/continuous-building.yml | 12 ++++++------ .github/workflows/continuous-packing.yml | 12 ++++++------ .github/workflows/continuous-releasing.yml | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/continuous-building.yml b/.github/workflows/continuous-building.yml index fac4a62..aef608f 100644 --- a/.github/workflows/continuous-building.yml +++ b/.github/workflows/continuous-building.yml @@ -94,7 +94,7 @@ jobs: if: ${{ startsWith(matrix.os, 'ubuntu-') }} run: | mkdir ${{ env.ARTIFACT_DIRECTORY_NAME }}-linux - unzip build-linux/${{ env.ARTIFACT_DIRECTORY_NAME }}-*.zip -d ${{ env.ARTIFACT_DIRECTORY_NAME }}-linux + 7z x "$(find build-linux/ -type f -name '${{ env.ARTIFACT_DIRECTORY_NAME }}-*.zip' | head -n 1)" -o"${{ env.ARTIFACT_DIRECTORY_NAME }}-linux/" -y shell: bash - name: "Linux: Pack and upload the artifact" if: ${{ startsWith(matrix.os, 'ubuntu-') }} @@ -350,7 +350,7 @@ jobs: if: ${{ startsWith(matrix.os, 'ubuntu-') }} run: | make package - unzip ${{ env.ARTIFACT_DIRECTORY_NAME }}-*-linux.zip + 7z x "$(find . -type f -name '${{ env.ARTIFACT_DIRECTORY_NAME }}-*-linux.zip' | head -n 1)" mv ${{ env.ARTIFACT_DIRECTORY_NAME }}-*-linux/ ${{ env.ARTIFACT_DIRECTORY_NAME }}-linux/ shell: bash - name: "Linux: Pack and upload the artifact" @@ -380,7 +380,7 @@ jobs: if: ${{ startsWith(matrix.os, 'windows-') }} run: | make package - unzip ${env:ARTIFACT_DIRECTORY_NAME}-*-windows.zip + 7z x "$(find . -type f -name '${{ env.ARTIFACT_DIRECTORY_NAME }}-*-windows.zip' | head -n 1)" mv ${env:ARTIFACT_DIRECTORY_NAME}-*-windows/ ${env:ARTIFACT_DIRECTORY_NAME}-windows/ shell: pwsh - name: "Windows: Pack and upload the artifact" @@ -595,7 +595,7 @@ jobs: run: | curl -L "${{ env.EXTRA_DOWNLOAD_URL }}" -o ${{ env.ARTIFACT_DIRECTORY_NAME }}-${{ env.EXTRA_DIRECTORY_NAME }}.zip mkdir -p ${{ env.ARTIFACT_DIRECTORY_NAME }}-files/wads/ - unzip ${{ env.ARTIFACT_DIRECTORY_NAME }}-${{ env.EXTRA_DIRECTORY_NAME }}.zip -d ${{ env.ARTIFACT_DIRECTORY_NAME }}-files/wads/ + 7z x ${{ env.ARTIFACT_DIRECTORY_NAME }}-${{ env.EXTRA_DIRECTORY_NAME }}.zip -o"${{ env.ARTIFACT_DIRECTORY_NAME }}-files/wads/${{ env.EXTRA_DIRECTORY_NAME }}/" -y shell: bash env: EXTRA_NAME: Prototype WAD @@ -605,7 +605,7 @@ jobs: run: | curl -L "${{ env.EXTRA_DOWNLOAD_URL }}" -o ${{ env.ARTIFACT_DIRECTORY_NAME }}-${{ env.EXTRA_DIRECTORY_NAME }}.zip mkdir -p ${{ env.ARTIFACT_DIRECTORY_NAME }}-files/palette/ - unzip ${{ env.ARTIFACT_DIRECTORY_NAME }}-${{ env.EXTRA_DIRECTORY_NAME }}.zip -d ${{ env.ARTIFACT_DIRECTORY_NAME }}-files/palette/ + 7z x ${{ env.ARTIFACT_DIRECTORY_NAME }}-${{ env.EXTRA_DIRECTORY_NAME }}.zip -o"${{ env.ARTIFACT_DIRECTORY_NAME }}-files/${{ env.EXTRA_DIRECTORY_NAME }}/" -y shell: bash env: EXTRA_NAME: Quake Palette @@ -615,7 +615,7 @@ jobs: run: | curl -L "${{ env.EXTRA_DOWNLOAD_URL }}" -o ${{ env.ARTIFACT_DIRECTORY_NAME }}-${{ env.EXTRA_DIRECTORY_NAME }}.zip mkdir -p ${{ env.ARTIFACT_DIRECTORY_NAME }}-files/source/ - unzip ${{ env.ARTIFACT_DIRECTORY_NAME }}-${{ env.EXTRA_DIRECTORY_NAME }}.zip -d ${{ env.ARTIFACT_DIRECTORY_NAME }}-files/source/ + 7z x ${{ env.ARTIFACT_DIRECTORY_NAME }}-${{ env.EXTRA_DIRECTORY_NAME }}.zip -o"${{ env.ARTIFACT_DIRECTORY_NAME }}-files/source/${{ env.EXTRA_DIRECTORY_NAME }}/" -y shell: bash env: EXTRA_NAME: TrenchBroom Quake Map Source diff --git a/.github/workflows/continuous-packing.yml b/.github/workflows/continuous-packing.yml index 17bbee7..f78529e 100644 --- a/.github/workflows/continuous-packing.yml +++ b/.github/workflows/continuous-packing.yml @@ -37,7 +37,7 @@ jobs: if: ${{ startsWith(matrix.os, 'ubuntu-') }} run: | mkdir -p ${{ env.PROJECT_NAME_PREFIX }}-linux/tools/${{ env.ARTIFACT_DIRECTORY_NAME }}/ - unzip ${{ env.ARTIFACT_DIRECTORY_NAME }}-binaries-linux.zip -d ${{ env.PROJECT_NAME_PREFIX }}-linux/tools/${{ env.ARTIFACT_DIRECTORY_NAME }}/ + 7z x ${{ env.ARTIFACT_DIRECTORY_NAME }}-binaries-linux.zip -o"${{ env.PROJECT_NAME_PREFIX }}-linux/tools/${{ env.ARTIFACT_DIRECTORY_NAME }}/" -y shell: bash env: ARTIFACT_NAME: ericw-tools @@ -57,7 +57,7 @@ jobs: if: ${{ startsWith(matrix.os, 'ubuntu-') }} run: | mkdir -p ${{ env.PROJECT_NAME_PREFIX }}-linux/game/ - unzip ${{ env.ARTIFACT_DIRECTORY_NAME }}-binaries-linux.zip -d ${{ env.PROJECT_NAME_PREFIX }}-linux/game/ + 7z x ${{ env.ARTIFACT_DIRECTORY_NAME }}-binaries-linux.zip -o"${{ env.PROJECT_NAME_PREFIX }}-linux/game/" -y shell: bash env: ARTIFACT_NAME: Ironwail @@ -77,7 +77,7 @@ jobs: if: ${{ startsWith(matrix.os, 'ubuntu-') }} run: | mkdir -p ${{ env.PROJECT_NAME_PREFIX }}-linux/tools/${{ env.ARTIFACT_DIRECTORY_NAME }}/ - unzip ${{ env.ARTIFACT_DIRECTORY_NAME }}-binaries-linux.zip -d ${{ env.PROJECT_NAME_PREFIX }}-linux/tools/${{ env.ARTIFACT_DIRECTORY_NAME }}/ + 7z x ${{ env.ARTIFACT_DIRECTORY_NAME }}-binaries-linux.zip -o"${{ env.PROJECT_NAME_PREFIX }}-linux/tools/${{ env.ARTIFACT_DIRECTORY_NAME }}/" -y shell: bash env: ARTIFACT_NAME: Quake CLI Tools @@ -97,7 +97,7 @@ jobs: if: ${{ startsWith(matrix.os, 'ubuntu-') }} run: | mkdir -p ${{ env.PROJECT_NAME_PREFIX }}-linux/level-editor/ - unzip ${{ env.ARTIFACT_DIRECTORY_NAME }}-binaries-linux.zip -d ${{ env.PROJECT_NAME_PREFIX }}-linux/level-editor/ + 7z x ${{ env.ARTIFACT_DIRECTORY_NAME }}-binaries-linux.zip -o"${{ env.PROJECT_NAME_PREFIX }}-linux/level-editor/" -y shell: bash env: ARTIFACT_NAME: TrenchBroom @@ -117,7 +117,7 @@ jobs: if: ${{ startsWith(matrix.os, 'ubuntu-') }} run: | mkdir -p ${{ env.PROJECT_NAME_PREFIX }}-linux/${{ env.ARTIFACT_DIRECTORY_NAME }}/ - unzip ${{ env.ARTIFACT_DIRECTORY_NAME }}-files.zip -d ${{ env.PROJECT_NAME_PREFIX }}-linux/${{ env.ARTIFACT_DIRECTORY_NAME }}/ + 7z x ${{ env.ARTIFACT_DIRECTORY_NAME }}-files.zip -o"${{ env.PROJECT_NAME_PREFIX }}-linux/${{ env.ARTIFACT_DIRECTORY_NAME }}/" -y shell: bash env: ARTIFACT_NAME: Extras @@ -260,7 +260,7 @@ jobs: echo -e "This is a release of [Quake Level Design Starter Kit](https://github.com/jonathanlinat/${{ env.PROJECT_NAME_PREFIX }}). For comprehensive details about the project and setup guidance, please [refer to the instructions](https://github.com/jonathanlinat/${{ env.PROJECT_NAME_PREFIX }}#readme).\n\n## Features\n\nThe current version of **QLDSK** includes the following set of tools and extras:\n\n### Tools" > "${{ env.PROJECT_NAME_PREFIX }}-release-notes/RELEASE_NOTES.md" IFS=',' read -r -a metadata_files <<< "${{ env.METADATA_FILES }}" for metadata_file in "${metadata_files[@]}"; do - unzip -p "$metadata_file-metadata.zip" METADATA.md >> "${{ env.PROJECT_NAME_PREFIX }}-release-notes/RELEASE_NOTES.md" + 7z e -so "$metadata_file-metadata.zip" METADATA.md >> "${{ env.PROJECT_NAME_PREFIX }}-release-notes/RELEASE_NOTES.md" -y done shell: bash env: diff --git a/.github/workflows/continuous-releasing.yml b/.github/workflows/continuous-releasing.yml index 61ffbec..36c4147 100644 --- a/.github/workflows/continuous-releasing.yml +++ b/.github/workflows/continuous-releasing.yml @@ -33,7 +33,7 @@ jobs: workflow: continuous-packing.yml skip_unpack: true - name: Unpack the release notes - run: unzip ${{ env.PROJECT_NAME_PREFIX }}-release-notes-*.zip -d ${{ env.PROJECT_NAME_PREFIX }}/ + run: 7z x "$(find . -type f -name '${{ env.PROJECT_NAME_PREFIX }}-release-notes-*.zip' | head -n 1)" -o${{ env.PROJECT_NAME_PREFIX }}/ shell: bash - name: Release the starter kit uses: ncipollo/release-action@v1