diff --git a/src/Umbraco.Web.UI.Client/.github/workflows/azure-static-web-apps-ashy-bay-09f36a803.yml b/src/Umbraco.Web.UI.Client/.github/workflows/azure-static-web-apps-ashy-bay-09f36a803.yml deleted file mode 100644 index 577a465c5b..0000000000 --- a/src/Umbraco.Web.UI.Client/.github/workflows/azure-static-web-apps-ashy-bay-09f36a803.yml +++ /dev/null @@ -1,49 +0,0 @@ -name: Azure Static Web Apps CI/CD - -on: - push: - branches: - - main - # pull_request: - # types: [opened, synchronize, reopened, closed] - # branches: - # - main - -env: - NODE_OPTIONS: --max_old_space_size=16384 - -jobs: - build_and_deploy_job: - if: false && github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed') - runs-on: ubuntu-latest - name: Build and Deploy Job - steps: - - uses: actions/checkout@v4 - with: - submodules: true - - name: Build And Deploy - id: builddeploy - uses: Azure/static-web-apps-deploy@v1 - with: - azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_ASHY_BAY_09F36A803 }} - repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments) - action: 'upload' - ###### Repository/Build Configurations - These values can be configured to match your app requirements. ###### - # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig - app_location: '/' # App source code path - api_location: 'api' # Api source code path - optional - output_location: 'dist-cms' # Built app content directory - optional - ###### End of Repository/Build Configurations ###### - - close_pull_request_job: - if: github.event_name == 'pull_request' && github.event.action == 'closed' - runs-on: ubuntu-latest - name: Close Pull Request Job - steps: - - name: Close Pull Request - id: closepullrequest - uses: Azure/static-web-apps-deploy@v1 - with: - app_location: '/' - azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_ASHY_BAY_09F36A803 }} - action: 'close' diff --git a/src/Umbraco.Web.UI.Client/.github/workflows/build_test.yml b/src/Umbraco.Web.UI.Client/.github/workflows/build_test.yml index 2cf2b96946..02e3828f2c 100644 --- a/src/Umbraco.Web.UI.Client/.github/workflows/build_test.yml +++ b/src/Umbraco.Web.UI.Client/.github/workflows/build_test.yml @@ -5,9 +5,9 @@ name: Build and test on: push: - branches: [ main ] + branches: [main] pull_request: - branches: [ main ] + branches: [main] # Allows GitHub to use this workflow to validate the merge queue merge_group: @@ -20,33 +20,32 @@ env: jobs: build: - runs-on: ubuntu-latest strategy: matrix: - node-version: [18.x] + node-version: [20] steps: - - uses: actions/checkout@v4 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v4 - with: - node-version: ${{ matrix.node-version }} - cache: 'npm' - - run: npm ci --no-audit --no-fund --prefer-offline - - run: npm run lint - - run: npm run build - - run: npm run generate:jsonschema:dist - - run: sudo npx playwright install-deps - - run: npm test - - name: Upload Code Coverage reports - uses: actions/upload-artifact@v3 - if: always() - with: - name: code-coverage - path: coverage/ - retention-days: 30 + - uses: actions/checkout@v4 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v4 + with: + node-version: ${{ matrix.node-version }} + cache: 'npm' + - run: npm ci --no-audit --no-fund --prefer-offline + - run: npm run lint + - run: npm run build + - run: npm run generate:jsonschema:dist + - run: sudo npx playwright install-deps + - run: npm test + - name: Upload Code Coverage reports + uses: actions/upload-artifact@v3 + if: always() + with: + name: code-coverage + path: coverage/ + retention-days: 30 # Commented out since it is outdated and is quite spammy # - name: Report code coverage # uses: zgosalvez/github-actions-report-lcov@v2 diff --git a/src/Umbraco.Web.UI.Client/.github/workflows/npm-publish-github-packages.yml b/src/Umbraco.Web.UI.Client/.github/workflows/npm-publish-github-packages.yml index 86f01e9417..3a2434bfd9 100644 --- a/src/Umbraco.Web.UI.Client/.github/workflows/npm-publish-github-packages.yml +++ b/src/Umbraco.Web.UI.Client/.github/workflows/npm-publish-github-packages.yml @@ -47,7 +47,7 @@ jobs: ref: ${{ inputs.ref }} - uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 20 cache: 'npm' registry-url: https://registry.npmjs.org/ scope: '@umbraco-cms' diff --git a/src/Umbraco.Web.UI.Client/.nvmrc b/src/Umbraco.Web.UI.Client/.nvmrc index b492b08635..48ef2c10ba 100644 --- a/src/Umbraco.Web.UI.Client/.nvmrc +++ b/src/Umbraco.Web.UI.Client/.nvmrc @@ -1 +1 @@ -18.16 +20.9 diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json index f754cdc9be..d46cba1e79 100644 --- a/src/Umbraco.Web.UI.Client/package-lock.json +++ b/src/Umbraco.Web.UI.Client/package-lock.json @@ -83,8 +83,8 @@ "web-component-analyzer": "^2.0.0-next.5" }, "engines": { - "node": ">=18.14 <19", - "npm": ">=9.5 < 10" + "node": ">=20.9 <21", + "npm": ">=10.1 < 11" } }, "node_modules/@75lb/deep-merge": { diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json index 78ab91afda..96db51c302 100644 --- a/src/Umbraco.Web.UI.Client/package.json +++ b/src/Umbraco.Web.UI.Client/package.json @@ -122,8 +122,8 @@ "prepublishOnly": "node ./devops/publish/cleanse-pkg.js" }, "engines": { - "node": ">=18.14 <19", - "npm": ">=9.5 < 10" + "node": ">=20.9 <21", + "npm": ">=10.1 < 11" }, "dependencies": { "@openid/appauth": "^1.3.1",