From 81722b50aa9221e3c6a1a5643328481c5152681e Mon Sep 17 00:00:00 2001 From: Danielku15 Date: Tue, 1 Nov 2022 14:28:13 +0100 Subject: [PATCH 1/2] Change runner and update workflows --- .github/workflows/build.yml | 40 ++++++------- .github/workflows/publish.yml | 103 ++++++++++++++-------------------- .github/workflows/release.yml | 38 ++++++------- 3 files changed, 77 insertions(+), 104 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b6ddcff69..032ee1b99 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,51 +10,51 @@ on: jobs: build_web: name: Build and Test Web - runs-on: windows-2022 + runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 with: - node-version: '12.x' + node-version: 'latest' - run: npm install - run: npm run build-ci - run: npm run test-ci build_csharp: name: Build and Test C# - runs-on: windows-2022 + runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 with: - node-version: '12.x' - - uses: actions/setup-dotnet@v1 + node-version: 'latest' + - uses: actions/setup-dotnet@v3 with: - dotnet-version: | - 6.0.x + dotnet-version: '6' - run: npm install - run: npm run build-csharp-ci - run: npm run test-csharp-ci build_kotlin: name: Build and Test Kotlin - runs-on: windows-2022 + runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 with: - node-version: '12.x' - - uses: actions/setup-java@v1 + node-version: 'latest' + - uses: actions/setup-java@v3 with: - java-version: '11' - - uses: actions/cache@v2 + java-version: '19' + distribution: 'temurin' + - uses: actions/cache@v3 with: path: | ~/.gradle/caches ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-cache-v2-${{ github.job }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} + key: ${{ runner.os }}-gradle-cache-v3-${{ github.job }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} restore-keys: | - ${{ runner.os }}-gradle-cache-v2-${{ github.job }}- + ${{ runner.os }}-gradle-cache-v3-${{ github.job }}- - run: npm install - run: npm run build-kotlin-ci - run: npm run test-kotlin-ci diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 30366ad7d..c1d5697df 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -7,104 +7,91 @@ on: jobs: nighty_web: name: Web - runs-on: windows-2022 + runs-on: ubuntu-latest steps: - - name: Create cache file - run: | + - run: | mkdir check-sha echo ${{ github.sha }} >> github-sha.txt - - name: Check SHA + - uses: actions/cache@v3 id: check_sha - uses: actions/cache@v2 with: path: check-sha key: check-sha-${{ github.sha }} - - name: Checkout the repo + - uses: actions/checkout@v3 if: steps.check_sha.outputs.cache-hit != 'true' - uses: actions/checkout@v2 - - name: Setup Node + - uses: actions/setup-node@v3 if: steps.check_sha.outputs.cache-hit != 'true' - uses: actions/setup-node@v2 with: - node-version: '16' + node-version: 'latest' - - name: Build Project + - run: npm install + if: steps.check_sha.outputs.cache-hit != 'true' + + - run: node ./scripts/update-version.js alpha ${{github.run_number}} + if: steps.check_sha.outputs.cache-hit != 'true' + + - run: npm run build-ci if: steps.check_sha.outputs.cache-hit != 'true' - run: | - npm install - node ./scripts/update-version.js alpha ${{github.run_number}} - npm run build-ci - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v3 if: steps.check_sha.outputs.cache-hit != 'true' with: - node-version: '16' + node-version: 'latest' registry-url: https://registry.npmjs.org/ - - name: Publish to NPM (alpha) + - run: npm publish --access public --tag alpha if: steps.check_sha.outputs.cache-hit != 'true' - run: npm publish --access public --tag alpha env: NODE_AUTH_TOKEN: ${{secrets.NPMJS_AUTH_TOKEN}} nightly_csharp: name: C# - runs-on: windows-2022 + runs-on: ubuntu-latest steps: - - name: Create cache file - run: | + - run: | mkdir check-sha echo ${{ github.sha }} >> github-sha.txt - - name: Check SHA + - uses: actions/cache@v3 id: check_sha - uses: actions/cache@v2 with: path: check-sha key: check-sha-${{ github.sha }} - - name: Checkout the repo + - uses: actions/checkout@v3 if: steps.check_sha.outputs.cache-hit != 'true' - uses: actions/checkout@v2 - - name: Setup Node + - uses: actions/setup-node@v3 if: steps.check_sha.outputs.cache-hit != 'true' - uses: actions/setup-node@v2 with: - node-version: '16' + node-version: 'latest' - - name: Setup DotNet + - uses: actions/setup-dotnet@v3 if: steps.check_sha.outputs.cache-hit != 'true' - uses: actions/setup-dotnet@v1 with: - dotnet-version: | - 6.0.x + dotnet-version: '6' - run: npm install if: steps.check_sha.outputs.cache-hit != 'true' - - name: Update C# Version + - run: node ./scripts/update-csharp-version.js alpha ${{github.run_number}} if: steps.check_sha.outputs.cache-hit != 'true' - run: node ./scripts/update-csharp-version.js alpha ${{github.run_number}} - - name: Build Project + - run: npm run build-csharp-ci if: steps.check_sha.outputs.cache-hit != 'true' - run: npm run build-csharp-ci - - name: Publish AlphaTab.nupkg + - run: dotnet nuget push src.csharp\AlphaTab\bin\Release\*.nupkg -k ${{secrets.NUGET_API_KEY}} -s https://api.nuget.org/v3/index.json if: steps.check_sha.outputs.cache-hit != 'true' - run: dotnet nuget push src.csharp\AlphaTab\bin\Release\*.nupkg -k ${{secrets.NUGET_API_KEY}} -s https://api.nuget.org/v3/index.json - - name: Publish AlphaTab.Windows.nupkg + - run: dotnet nuget push src.csharp\AlphaTab.Windows\bin\Release\*.nupkg -k ${{secrets.NUGET_API_KEY}} -s https://api.nuget.org/v3/index.json if: steps.check_sha.outputs.cache-hit != 'true' - run: dotnet nuget push src.csharp\AlphaTab.Windows\bin\Release\*.nupkg -k ${{secrets.NUGET_API_KEY}} -s https://api.nuget.org/v3/index.json nightly_kotlin_android: name: Kotlin (Android) - runs-on: windows-2022 + runs-on: ubuntu-latest env: OSSRH_USERNAME: ${{secrets.OSSRH_USERNAME}} OSSRH_PASSWORD: ${{secrets.OSSRH_PASSWORD}} @@ -113,55 +100,47 @@ jobs: SONATYPE_SIGNING_PASSWORD: ${{secrets.SONATYPE_SIGNING_PASSWORD}} SONATYPE_SIGNING_KEY: ${{secrets.SONATYPE_SIGNING_KEY}} steps: - - name: Create cache file - run: | + - run: | mkdir check-sha echo ${{ github.sha }} >> github-sha.txt - - name: Check SHA + - uses: actions/cache@v3 id: check_sha - uses: actions/cache@v2 with: path: check-sha key: check-sha-${{ github.sha }} - - name: Checkout the repo + - uses: actions/checkout@v3 if: steps.check_sha.outputs.cache-hit != 'true' - uses: actions/checkout@v2 - - name: Setup Node + - uses: actions/setup-node@v3 if: steps.check_sha.outputs.cache-hit != 'true' - uses: actions/setup-node@v2 with: - node-version: '16' + node-version: 'latest' - uses: actions/setup-java@v1 if: steps.check_sha.outputs.cache-hit != 'true' with: - java-version: '11' + java-version: '19' + distribution: 'temurin' - run: npm install if: steps.check_sha.outputs.cache-hit != 'true' - - name: Update Version + - name: node ./scripts/update-kotlin-version.js SNAPSHOT if: steps.check_sha.outputs.cache-hit != 'true' - run: node ./scripts/update-kotlin-version.js SNAPSHOT - - name: Build Project + - name: npm run build-kotlin-ci if: steps.check_sha.outputs.cache-hit != 'true' - run: npm run build-kotlin-ci - - name: Publish to Maven + - run: .\gradlew.bat publishAllPublicationsToSonatypeRepository if: steps.check_sha.outputs.cache-hit != 'true' - run: .\gradlew.bat publishAllPublicationsToSonatypeRepository working-directory: ./src.kotlin/alphaTab/ - - name: Release staging + - run: .\gradlew.bat closeAndReleaseSonatypeStagingRepository if: steps.check_sha.outputs.cache-hit != 'true' - run: .\gradlew.bat closeAndReleaseSonatypeStagingRepository working-directory: ./src.kotlin/alphaTab/ - - name: Stop Gradle Daemon + - run: .\gradlew.bat --stop if: steps.check_sha.outputs.cache-hit != 'true' - run: .\gradlew.bat --stop working-directory: ./src.kotlin/alphaTab/ diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b2cf3e3ce..f6cd30fd9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,41 +7,35 @@ on: jobs: release_web: name: Web - runs-on: windows-2022 + runs-on: ubuntu-latest steps: - # Checkout the repo - - uses: actions/checkout@v2 - - # Build Project - - uses: actions/setup-node@v2 - - name: Build Project - run: | - npm install - node ./scripts/update-version.js ${{github.run_number}} - npm run build-ci - - # Publish to GitHub Package Registry - - uses: actions/setup-node@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + with: + node-version: 'latest' + - run: npm install + - run: node ./scripts/update-version.js ${{github.run_number}} + - run: npm run build-ci + - uses: actions/setup-node@v3 with: - node-version: '12.x' + node-version: 'latest' registry-url: https://registry.npmjs.org/ - - name: Publish to GitHub Package Registry (release) + - name: Publish to NPM (release) run: npm publish --access public env: NODE_AUTH_TOKEN: ${{secrets.NPMJS_AUTH_TOKEN}} release_csharp: name: C# - runs-on: windows-2022 + runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: actions/setup-node@v1 with: - node-version: '12.x' - - uses: actions/setup-dotnet@v1 + node-version: 'latest' + - uses: actions/setup-dotnet@v3 with: - dotnet-version: | - 6.0.x + dotnet-version: '6' env: NUGET_AUTH_TOKEN: ${{secrets.NUGET_API_KEY}} - run: npm install From b80ba8b9824d42b4a07596ec72002f1d041967c3 Mon Sep 17 00:00:00 2001 From: Danielku15 Date: Tue, 1 Nov 2022 14:33:02 +0100 Subject: [PATCH 2/2] Change back to windows to have same visual results on tests. --- .github/workflows/build.yml | 6 +++--- .github/workflows/publish.yml | 6 +++--- .github/workflows/release.yml | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 032ee1b99..d68bd8a16 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,7 +10,7 @@ on: jobs: build_web: name: Build and Test Web - runs-on: ubuntu-latest + runs-on: windows-latest steps: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 @@ -22,7 +22,7 @@ jobs: build_csharp: name: Build and Test C# - runs-on: ubuntu-latest + runs-on: windows-latest steps: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 @@ -37,7 +37,7 @@ jobs: build_kotlin: name: Build and Test Kotlin - runs-on: ubuntu-latest + runs-on: windows-latest steps: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index c1d5697df..a2d19ce7a 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -7,7 +7,7 @@ on: jobs: nighty_web: name: Web - runs-on: ubuntu-latest + runs-on: windows-latest steps: - run: | mkdir check-sha @@ -49,7 +49,7 @@ jobs: nightly_csharp: name: C# - runs-on: ubuntu-latest + runs-on: windows-latest steps: - run: | mkdir check-sha @@ -91,7 +91,7 @@ jobs: nightly_kotlin_android: name: Kotlin (Android) - runs-on: ubuntu-latest + runs-on: windows-latest env: OSSRH_USERNAME: ${{secrets.OSSRH_USERNAME}} OSSRH_PASSWORD: ${{secrets.OSSRH_PASSWORD}} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f6cd30fd9..e7b9862fa 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,7 +7,7 @@ on: jobs: release_web: name: Web - runs-on: ubuntu-latest + runs-on: windows-latest steps: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 @@ -27,7 +27,7 @@ jobs: release_csharp: name: C# - runs-on: ubuntu-latest + runs-on: windows-latest steps: - uses: actions/checkout@v3 - uses: actions/setup-node@v1