From a884b885b40dee3a3a1cb97609cfdaca5a6e90d6 Mon Sep 17 00:00:00 2001 From: sappho Date: Thu, 25 Sep 2025 14:05:38 -0400 Subject: [PATCH 01/17] Update build-extension.yml --- .github/workflows/build-extension.yml | 61 ++++++++++++++++++++++++--- 1 file changed, 54 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-extension.yml b/.github/workflows/build-extension.yml index a29ecd6..a992fb3 100644 --- a/.github/workflows/build-extension.yml +++ b/.github/workflows/build-extension.yml @@ -60,7 +60,9 @@ jobs: gcc-multilib g++-multilib libstdc++6 lib32stdc++6 \ libc6-dev libc6-dev-i386 linux-libc-dev \ linux-libc-dev:i386 lib32z1-dev \ - zlib1g-dev:i386 zlib1g-dev ${{ inputs.cc }} + zlib1g-dev:i386 zlib1g-dev \ + tree \ + ${{ inputs.cc }} - name: Select clang compiler if: startsWith(runner.os, 'Linux') @@ -94,9 +96,54 @@ jobs: python ../configure.py --enable-optimize ambuild - - name: Upload package - if: ${{ inputs.upload }} - uses: actions/upload-artifact@v4 - with: - name: ${{ inputs.upload-artifact-name }} - path: build/package \ No newline at end of file + + #- name: Upload package + # if: ${{ inputs.upload }} + # uses: actions/upload-artifact@v4 + # with: + # name: ${{ inputs.upload-artifact-name }} + # path: build/package + + - name: Package release - Windows + if: startsWith(matrix.os, 'windows-') + working-directory: extension/build/package + run: | + Compress-Archive -Path * -Destination ${{ env.ZIP_FILENAME }} + Copy-Item -Path ${{ env.ZIP_FILENAME }} -Destination ${{ matrix.os }}_${{ matrix.cc }}_${{ env.ZIP_FILENAME }} + + - name: Package release - Linux + if: startsWith(matrix.os, 'ubuntu-') + working-directory: extension/build/package + run: | + zip -r "${{ env.ZIP_FILENAME }}" . + cp "${{ env.ZIP_FILENAME }}" "${{ matrix.os }}_${{ matrix.cc }}_${{ env.ZIP_FILENAME }}" + + + - name: Upload release + # if: github.event_name == 'push' && github.ref == 'refs/heads/master' + shell: bash + working-directory: extension/build/package + run: tree -r + #run: | + # echo "Begin upload..." + # AUTHORIZATION="$(echo -n '${{ secrets.USERNAME }}:${{ secrets.PASSWORD }}' | base64)" + # echo "::add-mask::${AUTHORIZATION}" + # + # HTTP_CODE=$(curl -XPOST -H "Authorization: Basic ${AUTHORIZATION}" -H "Content-Type: application/zip" --output /dev/null --silent --write-out "%{http_code}" --data-binary "@${{ env.ZIP_FILENAME }}" "https://builds.limetech.io/upload.php?project=accelerator&filename=${{ env.ZIP_FILENAME }}") + # if test ${HTTP_CODE} -ne 200; then + # exit ${HTTP_CODE} + # fi + # echo "Upload successful!" + + #- name: Upload a Build Artifact + # uses: actions/upload-artifact@v4 + # with: + # Artifact name + # name: ${{ matrix.os }}_${{ matrix.cc }}_${{ env.ZIP_FILENAME }} + # optional, default is artifact + # A file, directory or wildcard pattern that describes what to upload + # path: ${{ github.workspace }}/extension/build/package/${{ matrix.os }}_${{ matrix.cc }}_${{ env.ZIP_FILENAME }} + # The desired behavior if no files are found using the provided path. + # if-no-files-found: error + # Duration after which artifact will expire in days. 0 means using default retention. + # retention-days: 14 From 8a3d4ced9f67e5a0d69f6cb86b28effe777dbfac Mon Sep 17 00:00:00 2001 From: sappho Date: Thu, 25 Sep 2025 14:10:12 -0400 Subject: [PATCH 02/17] fix wrong workdir --- .github/workflows/build-extension.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build-extension.yml b/.github/workflows/build-extension.yml index a992fb3..ed21a22 100644 --- a/.github/workflows/build-extension.yml +++ b/.github/workflows/build-extension.yml @@ -104,25 +104,25 @@ jobs: # name: ${{ inputs.upload-artifact-name }} # path: build/package - - name: Package release - Windows - if: startsWith(matrix.os, 'windows-') - working-directory: extension/build/package - run: | - Compress-Archive -Path * -Destination ${{ env.ZIP_FILENAME }} - Copy-Item -Path ${{ env.ZIP_FILENAME }} -Destination ${{ matrix.os }}_${{ matrix.cc }}_${{ env.ZIP_FILENAME }} + #- name: Package release - Windows + # if: startsWith(matrix.os, 'windows-') + # working-directory: extension/build/package + # run: | + # Compress-Archive -Path * -Destination ${{ env.ZIP_FILENAME }} + # Copy-Item -Path ${{ env.ZIP_FILENAME }} -Destination ${{ matrix.os }}_${{ matrix.cc }}_${{ env.ZIP_FILENAME }} - - name: Package release - Linux - if: startsWith(matrix.os, 'ubuntu-') - working-directory: extension/build/package - run: | - zip -r "${{ env.ZIP_FILENAME }}" . - cp "${{ env.ZIP_FILENAME }}" "${{ matrix.os }}_${{ matrix.cc }}_${{ env.ZIP_FILENAME }}" + #- name: Package release - Linux + # if: startsWith(matrix.os, 'ubuntu-') + # working-directory: extension/build/package + # run: | + # zip -r "${{ env.ZIP_FILENAME }}" . + # cp "${{ env.ZIP_FILENAME }}" "${{ matrix.os }}_${{ matrix.cc }}_${{ env.ZIP_FILENAME }}" - name: Upload release # if: github.event_name == 'push' && github.ref == 'refs/heads/master' shell: bash - working-directory: extension/build/package + # working-directory: extension/build/package run: tree -r #run: | # echo "Begin upload..." From 8fefc6ff735381c9e2810d09cad26f6b64268396 Mon Sep 17 00:00:00 2001 From: sappho Date: Thu, 25 Sep 2025 14:15:52 -0400 Subject: [PATCH 03/17] more debugslop --- .github/workflows/build-extension.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-extension.yml b/.github/workflows/build-extension.yml index ed21a22..b8eff63 100644 --- a/.github/workflows/build-extension.yml +++ b/.github/workflows/build-extension.yml @@ -123,7 +123,11 @@ jobs: # if: github.event_name == 'push' && github.ref == 'refs/heads/master' shell: bash # working-directory: extension/build/package - run: tree -r + run: | + pwd + ls -la + ls -la ./build/package || true + tree -r #run: | # echo "Begin upload..." # AUTHORIZATION="$(echo -n '${{ secrets.USERNAME }}:${{ secrets.PASSWORD }}' | base64)" From 9614168357037f33c5196a2d7086da317f7a336b Mon Sep 17 00:00:00 2001 From: sappho Date: Thu, 25 Sep 2025 14:24:54 -0400 Subject: [PATCH 04/17] Update build-extension.yml --- .github/workflows/build-extension.yml | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-extension.yml b/.github/workflows/build-extension.yml index b8eff63..9bd21eb 100644 --- a/.github/workflows/build-extension.yml +++ b/.github/workflows/build-extension.yml @@ -36,6 +36,8 @@ jobs: env: SOURCEMOD: ${{ github.workspace }}/${{ inputs.cache-dir }}/sourcemod + PROJECT: 'accelerator' + steps: - uses: actions/checkout@v4 with: @@ -95,6 +97,10 @@ jobs: mkdir -p build && cd build python ../configure.py --enable-optimize ambuild + ZIP_FILENAME="${{ env.PROJECT }}-${{ github.sha }}-${{ runner.os }}.zip" + echo ${ZIP_FILENAME} + echo "ZIP_FILENAME=${ZIP_FILENAME}" >> $GITHUB_ENV + #- name: Upload package @@ -111,12 +117,12 @@ jobs: # Compress-Archive -Path * -Destination ${{ env.ZIP_FILENAME }} # Copy-Item -Path ${{ env.ZIP_FILENAME }} -Destination ${{ matrix.os }}_${{ matrix.cc }}_${{ env.ZIP_FILENAME }} - #- name: Package release - Linux - # if: startsWith(matrix.os, 'ubuntu-') - # working-directory: extension/build/package - # run: | - # zip -r "${{ env.ZIP_FILENAME }}" . - # cp "${{ env.ZIP_FILENAME }}" "${{ matrix.os }}_${{ matrix.cc }}_${{ env.ZIP_FILENAME }}" + - name: Package release - Linux + if: startsWith(runner.os, 'ubuntu-22.04') + working-directory: build/package + run: | + zip -r "${{ env.ZIP_FILENAME }}" . + cp "${{ env.ZIP_FILENAME }}" "${{ matrix.os }}_${{ matrix.cc }}_${{ env.ZIP_FILENAME }}" - name: Upload release @@ -127,13 +133,14 @@ jobs: pwd ls -la ls -la ./build/package || true + ls "${{ env.ZIP_FILENAME }}" tree -r #run: | # echo "Begin upload..." # AUTHORIZATION="$(echo -n '${{ secrets.USERNAME }}:${{ secrets.PASSWORD }}' | base64)" # echo "::add-mask::${AUTHORIZATION}" # - # HTTP_CODE=$(curl -XPOST -H "Authorization: Basic ${AUTHORIZATION}" -H "Content-Type: application/zip" --output /dev/null --silent --write-out "%{http_code}" --data-binary "@${{ env.ZIP_FILENAME }}" "https://builds.limetech.io/upload.php?project=accelerator&filename=${{ env.ZIP_FILENAME }}") + # HTTP_CODE=$(curl -XPOST -H "Authorization: Basic ${AUTHORIZATION}" -H "Content-Type: application/zip" --output /dev/null --silent --write-out "%{http_code}" --data-binary "@${{ env.ZIP_FILENAME }}" "https://builds.limetech.io/upload.php?project=${{ env.PROJECT }}&filename=${{ env.ZIP_FILENAME }}") # if test ${HTTP_CODE} -ne 200; then # exit ${HTTP_CODE} # fi From b1f8ec6b5dad5e7bbaed833d3ee6998231963e35 Mon Sep 17 00:00:00 2001 From: sappho Date: Thu, 25 Sep 2025 14:31:54 -0400 Subject: [PATCH 05/17] Update build-extension.yml --- .github/workflows/build-extension.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-extension.yml b/.github/workflows/build-extension.yml index 9bd21eb..38f9cca 100644 --- a/.github/workflows/build-extension.yml +++ b/.github/workflows/build-extension.yml @@ -118,7 +118,7 @@ jobs: # Copy-Item -Path ${{ env.ZIP_FILENAME }} -Destination ${{ matrix.os }}_${{ matrix.cc }}_${{ env.ZIP_FILENAME }} - name: Package release - Linux - if: startsWith(runner.os, 'ubuntu-22.04') + if: startsWith(matrix.os, 'ubuntu-22.04') working-directory: build/package run: | zip -r "${{ env.ZIP_FILENAME }}" . @@ -128,13 +128,13 @@ jobs: - name: Upload release # if: github.event_name == 'push' && github.ref == 'refs/heads/master' shell: bash - # working-directory: extension/build/package + # working-directory: build/package run: | pwd ls -la ls -la ./build/package || true - ls "${{ env.ZIP_FILENAME }}" - tree -r + ls ./build/package/"${{ env.ZIP_FILENAME }}" || true + tree -r || true #run: | # echo "Begin upload..." # AUTHORIZATION="$(echo -n '${{ secrets.USERNAME }}:${{ secrets.PASSWORD }}' | base64)" From 04b96113fa6bde7bcd80c5826536609dd42de4a8 Mon Sep 17 00:00:00 2001 From: sappho Date: Thu, 25 Sep 2025 14:54:12 -0400 Subject: [PATCH 06/17] use ${{ inputs.os }} please work --- .github/workflows/build-extension.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-extension.yml b/.github/workflows/build-extension.yml index 38f9cca..6de7022 100644 --- a/.github/workflows/build-extension.yml +++ b/.github/workflows/build-extension.yml @@ -111,14 +111,14 @@ jobs: # path: build/package #- name: Package release - Windows - # if: startsWith(matrix.os, 'windows-') + # if: startsWith(${{ inputs.os }}, 'windows-') # working-directory: extension/build/package # run: | # Compress-Archive -Path * -Destination ${{ env.ZIP_FILENAME }} # Copy-Item -Path ${{ env.ZIP_FILENAME }} -Destination ${{ matrix.os }}_${{ matrix.cc }}_${{ env.ZIP_FILENAME }} - name: Package release - Linux - if: startsWith(matrix.os, 'ubuntu-22.04') + if: startsWith(${{ inputs.os }}, 'ubuntu-22.04') working-directory: build/package run: | zip -r "${{ env.ZIP_FILENAME }}" . From d5edc8880be55aed2ce98cfa306aeab4973d7ada Mon Sep 17 00:00:00 2001 From: sappho Date: Thu, 25 Sep 2025 15:01:52 -0400 Subject: [PATCH 07/17] shorten sha hopefully --- .github/workflows/build-extension.yml | 29 ++++++++++++++------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build-extension.yml b/.github/workflows/build-extension.yml index 6de7022..ea750bc 100644 --- a/.github/workflows/build-extension.yml +++ b/.github/workflows/build-extension.yml @@ -52,6 +52,11 @@ jobs: key: ${{ inputs.cache-key }} fail-on-cache-miss: true enableCrossOsArchive: true + + # https://stackoverflow.com/a/64195658 + # i hate github actions + - name: Add SHORT_SHA env property with commit short sha + run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV - name: Linux dependencies if: startsWith(runner.os, 'Linux') @@ -97,12 +102,10 @@ jobs: mkdir -p build && cd build python ../configure.py --enable-optimize ambuild - ZIP_FILENAME="${{ env.PROJECT }}-${{ github.sha }}-${{ runner.os }}.zip" + ZIP_FILENAME="${{ env.PROJECT }}-${SHORT_SHA}-${{ runner.os }}.zip" echo ${ZIP_FILENAME} echo "ZIP_FILENAME=${ZIP_FILENAME}" >> $GITHUB_ENV - - #- name: Upload package # if: ${{ inputs.upload }} # uses: actions/upload-artifact@v4 @@ -110,12 +113,12 @@ jobs: # name: ${{ inputs.upload-artifact-name }} # path: build/package - #- name: Package release - Windows - # if: startsWith(${{ inputs.os }}, 'windows-') - # working-directory: extension/build/package - # run: | - # Compress-Archive -Path * -Destination ${{ env.ZIP_FILENAME }} - # Copy-Item -Path ${{ env.ZIP_FILENAME }} -Destination ${{ matrix.os }}_${{ matrix.cc }}_${{ env.ZIP_FILENAME }} + - name: Package release - Windows + if: startsWith(${{ inputs.os }}, 'windows') + working-directory: extension/build/package + run: | + Compress-Archive -Path * -Destination ${{ env.ZIP_FILENAME }} + Copy-Item -Path ${{ env.ZIP_FILENAME }} -Destination ${{ matrix.os }}_${{ matrix.cc }}_${{ env.ZIP_FILENAME }} - name: Package release - Linux if: startsWith(${{ inputs.os }}, 'ubuntu-22.04') @@ -128,13 +131,11 @@ jobs: - name: Upload release # if: github.event_name == 'push' && github.ref == 'refs/heads/master' shell: bash - # working-directory: build/package + working-directory: build/package run: | pwd - ls -la - ls -la ./build/package || true - ls ./build/package/"${{ env.ZIP_FILENAME }}" || true - tree -r || true + ls "${{ env.ZIP_FILENAME }}" || true + #run: | # echo "Begin upload..." # AUTHORIZATION="$(echo -n '${{ secrets.USERNAME }}:${{ secrets.PASSWORD }}' | base64)" From 977eb3ed84f39312bbd4ba7eed57380f269ca70c Mon Sep 17 00:00:00 2001 From: sappho Date: Thu, 25 Sep 2025 15:03:25 -0400 Subject: [PATCH 08/17] shell: bash for windows --- .github/workflows/build-extension.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-extension.yml b/.github/workflows/build-extension.yml index ea750bc..9957ae7 100644 --- a/.github/workflows/build-extension.yml +++ b/.github/workflows/build-extension.yml @@ -56,6 +56,7 @@ jobs: # https://stackoverflow.com/a/64195658 # i hate github actions - name: Add SHORT_SHA env property with commit short sha + shell: bash run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV - name: Linux dependencies From 748d8e5333b805720a2b9786068d6684c3be8f9e Mon Sep 17 00:00:00 2001 From: sappho Date: Thu, 25 Sep 2025 15:22:21 -0400 Subject: [PATCH 09/17] shell: pwsh for windows zipping why does shell: persist. come on man --- .github/workflows/build-extension.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-extension.yml b/.github/workflows/build-extension.yml index 9957ae7..bcd710a 100644 --- a/.github/workflows/build-extension.yml +++ b/.github/workflows/build-extension.yml @@ -115,6 +115,7 @@ jobs: # path: build/package - name: Package release - Windows + shell: pwsh if: startsWith(${{ inputs.os }}, 'windows') working-directory: extension/build/package run: | From 2c25bd0a415997295b04b753eb68fa8935554cd5 Mon Sep 17 00:00:00 2001 From: sappho Date: Thu, 25 Sep 2025 15:26:58 -0400 Subject: [PATCH 10/17] correct wrong order of shell: & if: for windows package uploading --- .github/workflows/build-extension.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-extension.yml b/.github/workflows/build-extension.yml index bcd710a..2bf1e04 100644 --- a/.github/workflows/build-extension.yml +++ b/.github/workflows/build-extension.yml @@ -115,8 +115,8 @@ jobs: # path: build/package - name: Package release - Windows - shell: pwsh - if: startsWith(${{ inputs.os }}, 'windows') + if: startsWith(${{ inputs.os }}, 'windows-latest') + # shell: pwsh working-directory: extension/build/package run: | Compress-Archive -Path * -Destination ${{ env.ZIP_FILENAME }} From 893ee7fe7a4da0d34e3a8d1ac7cee4c04a7cf8b6 Mon Sep 17 00:00:00 2001 From: sappho Date: Thu, 25 Sep 2025 15:32:44 -0400 Subject: [PATCH 11/17] echo debugging --- .github/workflows/build-extension.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-extension.yml b/.github/workflows/build-extension.yml index 2bf1e04..c3fcb62 100644 --- a/.github/workflows/build-extension.yml +++ b/.github/workflows/build-extension.yml @@ -57,7 +57,11 @@ jobs: # i hate github actions - name: Add SHORT_SHA env property with commit short sha shell: bash - run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV + run: | + echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV + echo ${{ inputs.os }} + echo ${{ env.SHORT_SHA }} + - name: Linux dependencies if: startsWith(runner.os, 'Linux') @@ -103,10 +107,11 @@ jobs: mkdir -p build && cd build python ../configure.py --enable-optimize ambuild - ZIP_FILENAME="${{ env.PROJECT }}-${SHORT_SHA}-${{ runner.os }}.zip" + ZIP_FILENAME="${{ env.PROJECT }}-${{ env.SHORT_SHA }}-${{ runner.os }}.zip" echo ${ZIP_FILENAME} echo "ZIP_FILENAME=${ZIP_FILENAME}" >> $GITHUB_ENV + #- name: Upload package # if: ${{ inputs.upload }} # uses: actions/upload-artifact@v4 From ed29b2514130b075c2ce40d2c415eeef4b50abe2 Mon Sep 17 00:00:00 2001 From: sappho Date: Thu, 25 Sep 2025 15:40:04 -0400 Subject: [PATCH 12/17] hack --- .github/workflows/build-extension.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-extension.yml b/.github/workflows/build-extension.yml index c3fcb62..0a27bca 100644 --- a/.github/workflows/build-extension.yml +++ b/.github/workflows/build-extension.yml @@ -59,7 +59,6 @@ jobs: shell: bash run: | echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV - echo ${{ inputs.os }} echo ${{ env.SHORT_SHA }} @@ -103,6 +102,7 @@ jobs: - name: Build (Release) if: not ${{ inputs.debug }} + shell: bash run: | mkdir -p build && cd build python ../configure.py --enable-optimize @@ -120,7 +120,7 @@ jobs: # path: build/package - name: Package release - Windows - if: startsWith(${{ inputs.os }}, 'windows-latest') + if: startsWith("${{ inputs.os }}", 'windows-latest') # shell: pwsh working-directory: extension/build/package run: | @@ -128,7 +128,7 @@ jobs: Copy-Item -Path ${{ env.ZIP_FILENAME }} -Destination ${{ matrix.os }}_${{ matrix.cc }}_${{ env.ZIP_FILENAME }} - name: Package release - Linux - if: startsWith(${{ inputs.os }}, 'ubuntu-22.04') + if: startsWith("${{ inputs.os }}", 'ubuntu-22.04') working-directory: build/package run: | zip -r "${{ env.ZIP_FILENAME }}" . From 4b16322890b4176642fedf10e6c2e5f07c490a44 Mon Sep 17 00:00:00 2001 From: sappho Date: Thu, 25 Sep 2025 15:49:34 -0400 Subject: [PATCH 13/17] Update build-extension.yml ${{ env.PROJECT_OS }} ? --- .github/workflows/build-extension.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-extension.yml b/.github/workflows/build-extension.yml index 0a27bca..d593cca 100644 --- a/.github/workflows/build-extension.yml +++ b/.github/workflows/build-extension.yml @@ -37,6 +37,7 @@ jobs: env: SOURCEMOD: ${{ github.workspace }}/${{ inputs.cache-dir }}/sourcemod PROJECT: 'accelerator' + PROJECT_OS: ${{ inputs.os }} steps: - uses: actions/checkout@v4 @@ -107,7 +108,7 @@ jobs: mkdir -p build && cd build python ../configure.py --enable-optimize ambuild - ZIP_FILENAME="${{ env.PROJECT }}-${{ env.SHORT_SHA }}-${{ runner.os }}.zip" + ZIP_FILENAME="${{ env.PROJECT }}-${{ env.SHORT_SHA }}-${{ env.PROJECT_OS }}.zip" echo ${ZIP_FILENAME} echo "ZIP_FILENAME=${ZIP_FILENAME}" >> $GITHUB_ENV @@ -120,7 +121,7 @@ jobs: # path: build/package - name: Package release - Windows - if: startsWith("${{ inputs.os }}", 'windows-latest') + if: startsWith("${{ env.PROJECT_OS }}", 'windows-latest') # shell: pwsh working-directory: extension/build/package run: | @@ -128,7 +129,7 @@ jobs: Copy-Item -Path ${{ env.ZIP_FILENAME }} -Destination ${{ matrix.os }}_${{ matrix.cc }}_${{ env.ZIP_FILENAME }} - name: Package release - Linux - if: startsWith("${{ inputs.os }}", 'ubuntu-22.04') + if: startsWith("${{ env.PROJECT_OS }}", 'ubuntu-22.04') working-directory: build/package run: | zip -r "${{ env.ZIP_FILENAME }}" . From 8184ead47007a88a8a6d4cf045e505bc58a03407 Mon Sep 17 00:00:00 2001 From: sappho Date: Thu, 25 Sep 2025 15:55:06 -0400 Subject: [PATCH 14/17] correct syntax --- .github/workflows/build-extension.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-extension.yml b/.github/workflows/build-extension.yml index d593cca..aedb227 100644 --- a/.github/workflows/build-extension.yml +++ b/.github/workflows/build-extension.yml @@ -121,15 +121,15 @@ jobs: # path: build/package - name: Package release - Windows - if: startsWith("${{ env.PROJECT_OS }}", 'windows-latest') + if: ${{ startsWith(env.PROJECT_OS, 'windows-latest') }} # shell: pwsh - working-directory: extension/build/package + working-directory: build/package run: | Compress-Archive -Path * -Destination ${{ env.ZIP_FILENAME }} Copy-Item -Path ${{ env.ZIP_FILENAME }} -Destination ${{ matrix.os }}_${{ matrix.cc }}_${{ env.ZIP_FILENAME }} - name: Package release - Linux - if: startsWith("${{ env.PROJECT_OS }}", 'ubuntu-22.04') + if: ${{ startsWith(env.PROJECT_OS, 'ubuntu-22.04') }} working-directory: build/package run: | zip -r "${{ env.ZIP_FILENAME }}" . From 3f8e2159d998020921a84257b67c47cf6a3bc4fe Mon Sep 17 00:00:00 2001 From: sappho Date: Fri, 26 Sep 2025 12:59:00 -0400 Subject: [PATCH 15/17] remove cruft --- .github/workflows/build-extension.yml | 56 +++++++++------------------ 1 file changed, 19 insertions(+), 37 deletions(-) diff --git a/.github/workflows/build-extension.yml b/.github/workflows/build-extension.yml index aedb227..c714fb3 100644 --- a/.github/workflows/build-extension.yml +++ b/.github/workflows/build-extension.yml @@ -60,8 +60,6 @@ jobs: shell: bash run: | echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV - echo ${{ env.SHORT_SHA }} - - name: Linux dependencies if: startsWith(runner.os, 'Linux') @@ -73,7 +71,6 @@ jobs: libc6-dev libc6-dev-i386 linux-libc-dev \ linux-libc-dev:i386 lib32z1-dev \ zlib1g-dev:i386 zlib1g-dev \ - tree \ ${{ inputs.cc }} - name: Select clang compiler @@ -112,14 +109,15 @@ jobs: echo ${ZIP_FILENAME} echo "ZIP_FILENAME=${ZIP_FILENAME}" >> $GITHUB_ENV + # github upload + - name: Upload release to GitHub + if: ${{ inputs.upload }} + uses: actions/upload-artifact@v4 + with: + name: ${{ inputs.upload-artifact-name }} + path: build/package + retention-days: 14 - #- name: Upload package - # if: ${{ inputs.upload }} - # uses: actions/upload-artifact@v4 - # with: - # name: ${{ inputs.upload-artifact-name }} - # path: build/package - - name: Package release - Windows if: ${{ startsWith(env.PROJECT_OS, 'windows-latest') }} # shell: pwsh @@ -135,35 +133,19 @@ jobs: zip -r "${{ env.ZIP_FILENAME }}" . cp "${{ env.ZIP_FILENAME }}" "${{ matrix.os }}_${{ matrix.cc }}_${{ env.ZIP_FILENAME }}" - - - name: Upload release + # limetech upload + - name: Upload release to limetech # if: github.event_name == 'push' && github.ref == 'refs/heads/master' shell: bash working-directory: build/package run: | - pwd - ls "${{ env.ZIP_FILENAME }}" || true + echo "Begin upload..." + AUTHORIZATION="$(echo -n '${{ secrets.USERNAME }}:${{ secrets.PASSWORD }}' | base64)" + echo "::add-mask::${AUTHORIZATION}" + + HTTP_CODE=$(curl -XPOST -H "Authorization: Basic ${AUTHORIZATION}" -H "Content-Type: application/zip" --output /dev/null --silent --write-out "%{http_code}" --data-binary "@${{ env.ZIP_FILENAME }}" "https://builds.limetech.io/upload.php?project=${{ env.PROJECT }}&filename=${{ env.ZIP_FILENAME }}") + if test ${HTTP_CODE} -ne 200; then + exit ${HTTP_CODE} + fi + echo "Upload successful!" - #run: | - # echo "Begin upload..." - # AUTHORIZATION="$(echo -n '${{ secrets.USERNAME }}:${{ secrets.PASSWORD }}' | base64)" - # echo "::add-mask::${AUTHORIZATION}" - # - # HTTP_CODE=$(curl -XPOST -H "Authorization: Basic ${AUTHORIZATION}" -H "Content-Type: application/zip" --output /dev/null --silent --write-out "%{http_code}" --data-binary "@${{ env.ZIP_FILENAME }}" "https://builds.limetech.io/upload.php?project=${{ env.PROJECT }}&filename=${{ env.ZIP_FILENAME }}") - # if test ${HTTP_CODE} -ne 200; then - # exit ${HTTP_CODE} - # fi - # echo "Upload successful!" - - #- name: Upload a Build Artifact - # uses: actions/upload-artifact@v4 - # with: - # Artifact name - # name: ${{ matrix.os }}_${{ matrix.cc }}_${{ env.ZIP_FILENAME }} - # optional, default is artifact - # A file, directory or wildcard pattern that describes what to upload - # path: ${{ github.workspace }}/extension/build/package/${{ matrix.os }}_${{ matrix.cc }}_${{ env.ZIP_FILENAME }} - # The desired behavior if no files are found using the provided path. - # if-no-files-found: error - # Duration after which artifact will expire in days. 0 means using default retention. - # retention-days: 14 From a05a9308f0dfd3f9e1c7e2d616c10a342eaa2849 Mon Sep 17 00:00:00 2001 From: sappho Date: Fri, 26 Sep 2025 13:12:46 -0400 Subject: [PATCH 16/17] SM_VERSION scraping --- .github/workflows/build-extension.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-extension.yml b/.github/workflows/build-extension.yml index c714fb3..d3d7551 100644 --- a/.github/workflows/build-extension.yml +++ b/.github/workflows/build-extension.yml @@ -60,7 +60,13 @@ jobs: shell: bash run: | echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV - + + - name: scrape version and export to env + shell: bash + run: | + echo "SM_VERSION=`cat ./extension/version.h | grep "#define SM_VERSION" | cut -f 2 -d '"'`" >> $GITHUB_ENV + echo ${{ env.SM_VERSION }} + - name: Linux dependencies if: startsWith(runner.os, 'Linux') run: | @@ -105,7 +111,7 @@ jobs: mkdir -p build && cd build python ../configure.py --enable-optimize ambuild - ZIP_FILENAME="${{ env.PROJECT }}-${{ env.SHORT_SHA }}-${{ env.PROJECT_OS }}.zip" + ZIP_FILENAME="${{ env.SM_VERSION }}-${{ env.SHORT_SHA }}-${{ env.PROJECT }}_${{ env.PROJECT_OS }}.zip" echo ${ZIP_FILENAME} echo "ZIP_FILENAME=${ZIP_FILENAME}" >> $GITHUB_ENV From 5fbbe981f1234a373422fb75d00314b6ebe10224 Mon Sep 17 00:00:00 2001 From: sappho Date: Fri, 26 Sep 2025 13:16:14 -0400 Subject: [PATCH 17/17] correct .zip name format to match current limetech builds --- .github/workflows/build-extension.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-extension.yml b/.github/workflows/build-extension.yml index d3d7551..4f652a1 100644 --- a/.github/workflows/build-extension.yml +++ b/.github/workflows/build-extension.yml @@ -111,7 +111,9 @@ jobs: mkdir -p build && cd build python ../configure.py --enable-optimize ambuild - ZIP_FILENAME="${{ env.SM_VERSION }}-${{ env.SHORT_SHA }}-${{ env.PROJECT }}_${{ env.PROJECT_OS }}.zip" + + # e.g. accelerator-2.6.0-abcdefg-windows.zip + ZIP_FILENAME="${{ env.PROJECT }}-${{ env.SM_VERSION }}-${{ env.SHORT_SHA }}-${{ env.PROJECT_OS }}.zip" echo ${ZIP_FILENAME} echo "ZIP_FILENAME=${ZIP_FILENAME}" >> $GITHUB_ENV