diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 2344bddf9..40603bb82 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -1,4 +1,4 @@ -name: v3-cd +name: v3 on: push: branches: @@ -14,13 +14,13 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v3.6.0 + - name: Get Node version from Node manifest + run: echo "NODE_VER=$(curl -s https://nwjs.io/versions | jq -r ".versions[0].components.node")" >> $GITHUB_ENV - name: Setup Node uses: actions/setup-node@v3.8.1 with: - node-version: "20.5.1" + node-version: ${{ env.NODE_VER }} cache: "npm" - - name: Enable corepack - run: corepack enable - name: Install dependencies run: npm ci - name: Publish to npm diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 09c52f9a7..c8b16c0d2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,11 +1,8 @@ -name: v3-ci +name: v3 on: pull_request: branches: - v3 - workflow_dispatch: - branches: - - v3 concurrency: group: ${{ github.ref }} @@ -15,20 +12,22 @@ jobs: e2e: strategy: matrix: - os: [macos-13, ubuntu-22.04, windows-2022] - node: [16, 18, 20] + os: + - macos-13 + - ubuntu-22.04 + - windows-2022 fail-fast: false runs-on: ${{ matrix.os }} steps: - name: Checkout repository uses: actions/checkout@v3.6.0 + - name: Get Node version from Node manifest + run: echo "NODE_VER=$(curl -s https://nwjs.io/versions | jq -r ".versions[0].components.node")" >> $GITHUB_ENV - name: Setup Node uses: actions/setup-node@v3.8.1 with: - node-version: ${{ matrix.node }} + node-version: ${{ env.NODE_VER }} cache: "npm" - - name: Enable corepack - run: corepack enable - name: Install dependencies run: npm ci - name: Check for linting errors diff --git a/.github/workflows/rel.yml b/.github/workflows/rel.yml index 2b0535e0e..158c69cc1 100644 --- a/.github/workflows/rel.yml +++ b/.github/workflows/rel.yml @@ -1,3 +1,4 @@ +name: release-please on: push: branches: @@ -7,8 +8,6 @@ permissions: contents: write pull-requests: write -name: release-please - jobs: release-please: runs-on: ubuntu-22.04 @@ -17,4 +16,4 @@ jobs: uses: google-github-actions/release-please-action@v4.0.2 with: token: ${{ secrets.GITHUB_TOKEN }} - target-branch: v3 \ No newline at end of file + target-branch: v3 diff --git a/.github/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md similarity index 100% rename from .github/CODE_OF_CONDUCT.md rename to CODE_OF_CONDUCT.md diff --git a/.github/LICENSE b/LICENSE similarity index 92% rename from .github/LICENSE rename to LICENSE index b0739d6b1..7e8f3af1e 100644 --- a/.github/LICENSE +++ b/LICENSE @@ -1,6 +1,7 @@ The MIT License (MIT) -Copyright (c) 2014 Steffen Müller +Copyright (c) 2021-2023 NW.js Utilities +Copyright (c) 2014-2021 Steffen Müller Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in diff --git a/package.json b/package.json index 77994f105..7509df792 100644 --- a/package.json +++ b/package.json @@ -78,5 +78,5 @@ "winston": "^3.11.0", "yargs": "^17.7.2" }, - "packageManager": "npm@9.8.1" + "packageManager": "npm@10.5.2" }