From f2d22a2298c9fcc99c76c3b406b73dd963702d26 Mon Sep 17 00:00:00 2001 From: crashzk Date: Sun, 17 Sep 2023 13:24:42 -0300 Subject: [PATCH 1/5] Update build.yml --- .github/workflows/build.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 971efeb..685815c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,7 +8,7 @@ jobs: continue-on-error: ${{ matrix.sm-version == '1.11.x' }} strategy: matrix: - sm-version: [ '1.9.x', '1.10.x', '1.11.x' ] + sm-version: [ '1.10.x', '1.11.x', '1.12.x' ] include: - sm-version: "1.11.x" # https://github.com/rumblefrog/setup-sp/issues/5 compiler-options: "-i=$includePath" @@ -57,15 +57,15 @@ jobs: - name: Find Assets shell: bash run: | - echo "artifact-1_9=$(find * -maxdepth 0 -type d -name "*1.9*")" >> $GITHUB_ENV echo "artifact-1_10=$(find * -maxdepth 0 -type d -name "*1.10*")" >> $GITHUB_ENV echo "artifact-1_11=$(find * -maxdepth 0 -type d -name "*1.11*")" >> $GITHUB_ENV + echo "artifact-1_12=$(find * -maxdepth 0 -type d -name "*1.12*")" >> $GITHUB_ENV - name: Arhive Assets run: | - zip -r ${{ env.artifact-1_9 }}.zip ${{ env.artifact-1_9 }} zip -r ${{ env.artifact-1_10 }}.zip ${{ env.artifact-1_10 }} zip -r ${{ env.artifact-1_11 }}.zip ${{ env.artifact-1_11 }} + zip -r ${{ env.artifact-1_12 }}.zip ${{ env.artifact-1_12 }} - name: Create Release id: create_release @@ -77,15 +77,15 @@ jobs: release_name: ${{ github.ref_name }} draft: true prerelease: false - + - name: Upload Asset uses: actions/upload-release-asset@v1.0.1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ${{ env.artifact-1_9 }}.zip - asset_name: ${{ env.artifact-1_9 }}.zip + asset_path: ${{ env.artifact-1_10 }}.zip + asset_name: ${{ env.artifact-1_10 }}.zip asset_content_type: application/zip - name: Upload Asset @@ -94,16 +94,16 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ${{ env.artifact-1_10 }}.zip - asset_name: ${{ env.artifact-1_10 }}.zip + asset_path: ${{ env.artifact-1_11 }}.zip + asset_name: ${{ env.artifact-1_11 }}.zip asset_content_type: application/zip - - name: Upload Asset + - name: Upload Asset uses: actions/upload-release-asset@v1.0.1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ${{ env.artifact-1_11 }}.zip - asset_name: ${{ env.artifact-1_11 }}.zip - asset_content_type: application/zip \ No newline at end of file + asset_path: ${{ env.artifact-1_12 }}.zip + asset_name: ${{ env.artifact-1_12 }}.zip + asset_content_type: application/zip From c6beeef908add3f293c74d1c18e383d2b43e7ba2 Mon Sep 17 00:00:00 2001 From: crashzk Date: Sun, 17 Sep 2023 13:30:21 -0300 Subject: [PATCH 2/5] Update build.yml --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 685815c..9c14106 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -60,7 +60,7 @@ jobs: echo "artifact-1_10=$(find * -maxdepth 0 -type d -name "*1.10*")" >> $GITHUB_ENV echo "artifact-1_11=$(find * -maxdepth 0 -type d -name "*1.11*")" >> $GITHUB_ENV echo "artifact-1_12=$(find * -maxdepth 0 -type d -name "*1.12*")" >> $GITHUB_ENV - + - name: Arhive Assets run: | zip -r ${{ env.artifact-1_10 }}.zip ${{ env.artifact-1_10 }} @@ -107,3 +107,4 @@ jobs: asset_path: ${{ env.artifact-1_12 }}.zip asset_name: ${{ env.artifact-1_12 }}.zip asset_content_type: application/zip + From 75da6f7700060a188a5b0bc40c91a44829d03bff Mon Sep 17 00:00:00 2001 From: crashzk Date: Sun, 17 Sep 2023 13:31:36 -0300 Subject: [PATCH 3/5] Update build.yml --- .github/workflows/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9c14106..b9fb3e9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -98,7 +98,7 @@ jobs: asset_name: ${{ env.artifact-1_11 }}.zip asset_content_type: application/zip - - name: Upload Asset + - name: Upload Asset uses: actions/upload-release-asset@v1.0.1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -107,4 +107,3 @@ jobs: asset_path: ${{ env.artifact-1_12 }}.zip asset_name: ${{ env.artifact-1_12 }}.zip asset_content_type: application/zip - From 6c0d63838d84717201d02a855a62c4951fa73cbd Mon Sep 17 00:00:00 2001 From: crashzk Date: Sun, 17 Sep 2023 17:02:34 -0300 Subject: [PATCH 4/5] Update build.yml --- .github/workflows/build.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b9fb3e9..e142d3f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,13 +5,10 @@ on: [push, pull_request, workflow_dispatch] jobs: compile: runs-on: ubuntu-latest - continue-on-error: ${{ matrix.sm-version == '1.11.x' }} + continue-on-error: ${{ matrix.sm-version == '1.12.x' }} strategy: matrix: sm-version: [ '1.10.x', '1.11.x', '1.12.x' ] - include: - - sm-version: "1.11.x" # https://github.com/rumblefrog/setup-sp/issues/5 - compiler-options: "-i=$includePath" name: "Build SM ${{ matrix.sm-version }}" steps: @@ -60,7 +57,7 @@ jobs: echo "artifact-1_10=$(find * -maxdepth 0 -type d -name "*1.10*")" >> $GITHUB_ENV echo "artifact-1_11=$(find * -maxdepth 0 -type d -name "*1.11*")" >> $GITHUB_ENV echo "artifact-1_12=$(find * -maxdepth 0 -type d -name "*1.12*")" >> $GITHUB_ENV - + - name: Arhive Assets run: | zip -r ${{ env.artifact-1_10 }}.zip ${{ env.artifact-1_10 }} @@ -78,7 +75,7 @@ jobs: draft: true prerelease: false - - name: Upload Asset + - name: Upload Asset 1.10 uses: actions/upload-release-asset@v1.0.1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -88,7 +85,7 @@ jobs: asset_name: ${{ env.artifact-1_10 }}.zip asset_content_type: application/zip - - name: Upload Asset + - name: Upload Asset 1.11 uses: actions/upload-release-asset@v1.0.1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -98,7 +95,7 @@ jobs: asset_name: ${{ env.artifact-1_11 }}.zip asset_content_type: application/zip - - name: Upload Asset + - name: Upload Asset 1.12 uses: actions/upload-release-asset@v1.0.1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -107,3 +104,4 @@ jobs: asset_path: ${{ env.artifact-1_12 }}.zip asset_name: ${{ env.artifact-1_12 }}.zip asset_content_type: application/zip + From 344c467e8ae270945c4643fb961d4da3b98a35d2 Mon Sep 17 00:00:00 2001 From: crashzk Date: Sun, 17 Sep 2023 17:04:28 -0300 Subject: [PATCH 5/5] Update build.yml --- .github/workflows/build.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e142d3f..e6a0b6c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,7 +32,7 @@ jobs: mkdir plugins cd scripting spcomp VIP_Core.sp -E -o ../plugins/VIP_Core.smx -iinclude ${{ matrix.compiler-options }} - + - name: Upload artifact uses: actions/upload-artifact@v3 with: @@ -41,7 +41,7 @@ jobs: addons LICENSE retention-days: 2 - + release: name: Release if: github.ref_type == 'tag' @@ -57,7 +57,7 @@ jobs: echo "artifact-1_10=$(find * -maxdepth 0 -type d -name "*1.10*")" >> $GITHUB_ENV echo "artifact-1_11=$(find * -maxdepth 0 -type d -name "*1.11*")" >> $GITHUB_ENV echo "artifact-1_12=$(find * -maxdepth 0 -type d -name "*1.12*")" >> $GITHUB_ENV - + - name: Arhive Assets run: | zip -r ${{ env.artifact-1_10 }}.zip ${{ env.artifact-1_10 }} @@ -104,4 +104,3 @@ jobs: asset_path: ${{ env.artifact-1_12 }}.zip asset_name: ${{ env.artifact-1_12 }}.zip asset_content_type: application/zip -