From 48381e47e5112c61bee91314ff3d5ad0a7336148 Mon Sep 17 00:00:00 2001 From: Carey Williams Date: Sun, 1 May 2022 13:37:32 +0100 Subject: [PATCH 1/9] Update create-release.yml --- .github/workflows/create-release.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 70cef2d..dded472 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -10,6 +10,7 @@ on: tag: type: string required: true + pull_request: schedule: - cron: '00 2 * * *' @@ -26,18 +27,18 @@ jobs: with: fetch-depth: 0 - name: Generate nightly release notes - if: github.event_name == 'schedule' + if: github.event_name == 'pull_request' id: nightly_relnotes run: | echo "::set-output name=relnotes::$(git log --since=yesterday --pretty=format:%s | awk 'NR>1{print "- "$0} NR==1{print "- "$0}')" - name: Setup Python dependencies - if: github.event_name != 'schedule' || steps.nightly_relnotes.outputs.relnotes != '' + if: github.event_name != 'pull_request' || steps.nightly_relnotes.outputs.relnotes != '' run: | pip3 install mkdocs pip3 install mkdocs-material pip3 install mkdocs-localsearch - name: Build and Archive - if: github.event_name != 'schedule' || steps.nightly_relnotes.outputs.relnotes != '' + if: github.event_name != 'pull_request' || steps.nightly_relnotes.outputs.relnotes != '' run: | npm install grunt-cli -g npm install . @@ -45,10 +46,10 @@ jobs: cd build && zip -r ../package.nw . - name: Get Date id: date - if: github.event_name != 'schedule' || steps.nightly_relnotes.outputs.relnotes != '' + if: github.event_name != 'pull_request' || steps.nightly_relnotes.outputs.relnotes != '' run: echo "::set-output name=date::$(date +'%D')" - name: Generate nightly tag - if: github.event_name != 'schedule' || steps.nightly_relnotes.outputs.relnotes != '' + if: github.event_name != 'pull_request' || steps.nightly_relnotes.outputs.relnotes != '' id: nightly_tag run: | echo "::set-output name=tag::nightly_$(date +"%Y.%m.%d")" @@ -60,7 +61,7 @@ jobs: token: ${{ secrets.CSIDESHELL }} - name: Release Nightly uses: softprops/action-gh-release@v1 - if: github.event_name == 'schedule' && steps.nightly_relnotes.outputs.relnotes != '' + if: github.event_name == 'pull_request' && steps.nightly_relnotes.outputs.relnotes != '' with: tag_name: ${{ steps.nightly_tag.outputs.tag }} name: 'Nightly Release (${{ steps.date.outputs.date }})' From 76ae8613940a11d7fc6ce03c4ad9dd68e5d2542f Mon Sep 17 00:00:00 2001 From: Carey Williams Date: Sun, 1 May 2022 13:58:26 +0100 Subject: [PATCH 2/9] Update create-release.yml --- .github/workflows/create-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index dded472..59cea19 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -30,7 +30,7 @@ jobs: if: github.event_name == 'pull_request' id: nightly_relnotes run: | - echo "::set-output name=relnotes::$(git log --since=yesterday --pretty=format:%s | awk 'NR>1{print "- "$0} NR==1{print "- "$0}')" + echo "::set-output name=relnotes::$(git log --since="20 minutes ago" --pretty=format:%s | awk 'NR>1{print "- "$0} NR==1{print "- "$0}')" - name: Setup Python dependencies if: github.event_name != 'pull_request' || steps.nightly_relnotes.outputs.relnotes != '' run: | From 86d35785da6a4875a530bf9b0340fe09380f0f36 Mon Sep 17 00:00:00 2001 From: Carey Williams Date: Sun, 1 May 2022 14:01:00 +0100 Subject: [PATCH 3/9] Update create-release.yml --- .github/workflows/create-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 59cea19..00daca0 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -30,7 +30,7 @@ jobs: if: github.event_name == 'pull_request' id: nightly_relnotes run: | - echo "::set-output name=relnotes::$(git log --since="20 minutes ago" --pretty=format:%s | awk 'NR>1{print "- "$0} NR==1{print "- "$0}')" + echo "::set-output name=relnotes::$(git log --since="xx" --pretty=format:%s | awk 'NR>1{print "- "$0} NR==1{print "- "$0}')" - name: Setup Python dependencies if: github.event_name != 'pull_request' || steps.nightly_relnotes.outputs.relnotes != '' run: | From 9767d4442bfab2d23595fa3c8af29dff15ff0c57 Mon Sep 17 00:00:00 2001 From: Carey Williams Date: Sun, 1 May 2022 14:22:29 +0100 Subject: [PATCH 4/9] Update create-release.yml --- .github/workflows/create-release.yml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 00daca0..7af9e55 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -16,7 +16,18 @@ on: jobs: release: - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest, macos-latest, windows-latest] + include: + - os: ubuntu-latest + platform: "linux" + experimental: true # we don't actually ship CSIDE on Linux + - os: macos-latest + platform: "mac" + - os: windows-latest + platform: "windows" steps: - name: Setup Node.js environment uses: actions/setup-node@v1.4.4 @@ -43,7 +54,7 @@ jobs: npm install grunt-cli -g npm install . grunt - cd build && zip -r ../package.nw . + cd build && zip -r ../${{matrix.platform}-package.nw . - name: Get Date id: date if: github.event_name != 'pull_request' || steps.nightly_relnotes.outputs.relnotes != '' From 6d9fc783f0bd92813bbb10fb25f8de282abd5ab0 Mon Sep 17 00:00:00 2001 From: Carey Williams Date: Sun, 1 May 2022 14:26:31 +0100 Subject: [PATCH 5/9] Update create-release.yml --- .github/workflows/create-release.yml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 3fc90f6..fa26a48 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -16,18 +16,7 @@ on: jobs: release: - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-latest, macos-latest, windows-latest] - include: - - os: ubuntu-latest - platform: "linux" - experimental: true # we don't actually ship CSIDE on Linux - - os: macos-latest - platform: "mac" - - os: windows-latest - platform: "windows" + runs-on: macos-latest steps: - name: Setup Node.js environment uses: actions/setup-node@v1.4.4 From 98c2c2e8cf60464f3ed033f4038b125aa4b81a2a Mon Sep 17 00:00:00 2001 From: Carey Williams Date: Sun, 1 May 2022 14:30:36 +0100 Subject: [PATCH 6/9] Update create-release.yml --- .github/workflows/create-release.yml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index fa26a48..e7026d6 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -16,7 +16,18 @@ on: jobs: release: - runs-on: macos-latest + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest, macos-latest, windows-latest] + include: + - os: ubuntu-latest + platform: "linux" + experimental: true # we don't actually ship CSIDE on Linux + - os: macos-latest + platform: "mac" + - os: windows-latest + platform: "windows" steps: - name: Setup Node.js environment uses: actions/setup-node@v1.4.4 @@ -43,7 +54,7 @@ jobs: npm install grunt-cli -g npm install . grunt - cd build && zip -r ../${{matrix.platform}-package.nw . + cd build && zip -r ../${{matrix.platform}}-package.nw . - name: Get Date id: date if: github.event_name != 'pull_request' || steps.nightly_relnotes.outputs.relnotes != '' From a3dfefd2cac9f7ff7db9df078149acfb656523a6 Mon Sep 17 00:00:00 2001 From: Carey Williams Date: Sun, 1 May 2022 14:34:29 +0100 Subject: [PATCH 7/9] Update create-release.yml --- .github/workflows/create-release.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index e7026d6..3c0fc98 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -19,15 +19,13 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, macos-latest, windows-latest] + os: [ubuntu-latest, macos-latest] include: - os: ubuntu-latest platform: "linux" experimental: true # we don't actually ship CSIDE on Linux - os: macos-latest platform: "mac" - - os: windows-latest - platform: "windows" steps: - name: Setup Node.js environment uses: actions/setup-node@v1.4.4 @@ -87,6 +85,6 @@ jobs: name: '${{ github.event.inputs.tag }} Release (${{ steps.date.outputs.date }})' tag_name: ${{ github.event.inputs.tag }} prerelease: ${{ github.event.inputs.prerelease }} - files: package.nw + files: ${{matrix.platform}}-package.nw token: ${{ secrets.CSIDESHELL }} From ee09058be09f4937c95762f5b3f388395a2b50d1 Mon Sep 17 00:00:00 2001 From: Carey Williams Date: Sun, 1 May 2022 14:39:12 +0100 Subject: [PATCH 8/9] Update create-release.yml --- .github/workflows/create-release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 3c0fc98..b7a1482 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -66,7 +66,7 @@ jobs: uses: softprops/action-gh-release@v1 if: startsWith(github.ref, 'refs/tags/v') with: - files: package.nw + files: ${{matrix.platform}}-package.nw token: ${{ secrets.CSIDESHELL }} - name: Release Nightly uses: softprops/action-gh-release@v1 @@ -75,7 +75,7 @@ jobs: tag_name: ${{ steps.nightly_tag.outputs.tag }} name: 'Nightly Release (${{ steps.date.outputs.date }})' prerelease: true - files: package.nw + files: ${{matrix.platform}}-package.nw body:

Commit Changelog

${{ steps.nightly_relnotes.outputs.relnotes }} token: ${{ secrets.CSIDESHELL }} - name: Triggered Release From 255188a3ee549241468f08ad6b821a4105e021ad Mon Sep 17 00:00:00 2001 From: Carey Williams Date: Sun, 1 May 2022 14:50:03 +0100 Subject: [PATCH 9/9] Update create-release.yml --- .github/workflows/create-release.yml | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index b7a1482..2eef4c3 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -16,16 +16,7 @@ on: jobs: release: - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-latest, macos-latest] - include: - - os: ubuntu-latest - platform: "linux" - experimental: true # we don't actually ship CSIDE on Linux - - os: macos-latest - platform: "mac" + runs-on: ubuntu-latest steps: - name: Setup Node.js environment uses: actions/setup-node@v1.4.4 @@ -52,7 +43,6 @@ jobs: npm install grunt-cli -g npm install . grunt - cd build && zip -r ../${{matrix.platform}}-package.nw . - name: Get Date id: date if: github.event_name != 'pull_request' || steps.nightly_relnotes.outputs.relnotes != '' @@ -66,7 +56,7 @@ jobs: uses: softprops/action-gh-release@v1 if: startsWith(github.ref, 'refs/tags/v') with: - files: ${{matrix.platform}}-package.nw + files: release/package.nw token: ${{ secrets.CSIDESHELL }} - name: Release Nightly uses: softprops/action-gh-release@v1 @@ -75,7 +65,7 @@ jobs: tag_name: ${{ steps.nightly_tag.outputs.tag }} name: 'Nightly Release (${{ steps.date.outputs.date }})' prerelease: true - files: ${{matrix.platform}}-package.nw + files: release/package.nw body:

Commit Changelog

${{ steps.nightly_relnotes.outputs.relnotes }} token: ${{ secrets.CSIDESHELL }} - name: Triggered Release @@ -85,6 +75,6 @@ jobs: name: '${{ github.event.inputs.tag }} Release (${{ steps.date.outputs.date }})' tag_name: ${{ github.event.inputs.tag }} prerelease: ${{ github.event.inputs.prerelease }} - files: ${{matrix.platform}}-package.nw + files: release/package.nw token: ${{ secrets.CSIDESHELL }}