diff --git a/.backportrc.json b/.backportrc.json index 570748c4..04a11993 100644 --- a/.backportrc.json +++ b/.backportrc.json @@ -8,7 +8,6 @@ "prTitle": "{{sourcePullRequest.title}} (backport #{{sourcePullRequest.number}})", "targetBranchChoices": [ "main", - "maintenance/v5.2", "maintenance/v5.3" ], "//": "~~ Generated by projen. To modify, edit .projenrc.ts and run \"npx projen\"." diff --git a/.gitattributes b/.gitattributes index 990dfeda..3232d832 100644 --- a/.gitattributes +++ b/.gitattributes @@ -7,10 +7,8 @@ /.github/pull_request_template.md linguist-generated /.github/workflows/auto-approve.yml linguist-generated /.github/workflows/auto-merge.yml linguist-generated -/.github/workflows/auto-tag-dev-v5.2.yml linguist-generated /.github/workflows/auto-tag-dev-v5.3.yml linguist-generated /.github/workflows/auto-tag-dev.yml linguist-generated -/.github/workflows/auto-tag-releases-v5.2.yml linguist-generated /.github/workflows/auto-tag-releases-v5.3.yml linguist-generated /.github/workflows/auto-tag-releases.yml linguist-generated /.github/workflows/backport.yml linguist-generated @@ -18,7 +16,6 @@ /.github/workflows/pull-request-lint.yml linguist-generated /.github/workflows/release.yml linguist-generated /.github/workflows/upgrade-main.yml linguist-generated -/.github/workflows/upgrade-maintenance-v5.2.yml linguist-generated /.github/workflows/upgrade-maintenance-v5.3.yml linguist-generated /.gitignore linguist-generated /.npmignore linguist-generated diff --git a/.github/workflows/auto-tag-dev-v5.2.yml b/.github/workflows/auto-tag-dev-v5.2.yml deleted file mode 100644 index 31766b01..00000000 --- a/.github/workflows/auto-tag-dev-v5.2.yml +++ /dev/null @@ -1,59 +0,0 @@ -# ~~ Generated by projen. To modify, edit .projenrc.ts and run "npx projen". - -name: auto-tag-dev-v5.2 -run-name: Auto-Tag Prerelease (v5.2) -on: - schedule: - - cron: 0 5 * * 0,2-6 - workflow_dispatch: {} -jobs: - pre-flight: - name: Pre-Flight Checks - runs-on: ubuntu-latest - permissions: - contents: read - outputs: - sha: ${{ steps.git.outputs.sha }} - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - repository: ${{ github.repository }} - ref: maintenance/v5.2 - - name: Setup Node.js - uses: actions/setup-node@v4 - with: - cache: yarn - node-version: "18" - - name: Install dependencies - run: yarn install --frozen-lockfile - - name: Build - run: yarn build - - name: Identify git SHA - id: git - run: echo sha=$(git rev-parse HEAD) >> $GITHUB_OUTPUT - auto-tag: - name: Auto-Tag Release - needs: pre-flight - runs-on: ubuntu-latest - permissions: {} - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - repository: ${{ github.repository }} - token: ${{ secrets.PROJEN_GITHUB_TOKEN }} - ref: ${{ needs.pre-flight.outputs.sha }} - - name: Setup Node.js - uses: actions/setup-node@v4 - with: - cache: yarn - node-version: "18" - - name: Install dependencies - run: yarn install --frozen-lockfile - - name: Set git identity - run: |- - git config user.name "github-actions" - git config user.email "github-actions@github.com" - - name: Tag PreRelease - run: yarn tag-release --idempotent --no-sign --push --prerelease=dev --release-line=5.2 diff --git a/.github/workflows/auto-tag-dev-v5.3.yml b/.github/workflows/auto-tag-dev-v5.3.yml index 8f05f73c..2c904f05 100644 --- a/.github/workflows/auto-tag-dev-v5.3.yml +++ b/.github/workflows/auto-tag-dev-v5.3.yml @@ -4,7 +4,7 @@ name: auto-tag-dev-v5.3 run-name: Auto-Tag Prerelease (v5.3) on: schedule: - - cron: 0 10 * * 0,2-6 + - cron: 0 5 * * 0,2-6 workflow_dispatch: {} jobs: pre-flight: diff --git a/.github/workflows/auto-tag-releases-v5.2.yml b/.github/workflows/auto-tag-releases-v5.2.yml deleted file mode 100644 index dea4ffdb..00000000 --- a/.github/workflows/auto-tag-releases-v5.2.yml +++ /dev/null @@ -1,59 +0,0 @@ -# ~~ Generated by projen. To modify, edit .projenrc.ts and run "npx projen". - -name: auto-tag-releases-v5.2 -run-name: Auto-Tag Release (v5.2) -on: - schedule: - - cron: 0 5 * * 1 - workflow_dispatch: {} -jobs: - pre-flight: - name: Pre-Flight Checks - runs-on: ubuntu-latest - permissions: - contents: read - outputs: - sha: ${{ steps.git.outputs.sha }} - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - repository: ${{ github.repository }} - ref: maintenance/v5.2 - - name: Setup Node.js - uses: actions/setup-node@v4 - with: - cache: yarn - node-version: "18" - - name: Install dependencies - run: yarn install --frozen-lockfile - - name: Build - run: yarn build - - name: Identify git SHA - id: git - run: echo sha=$(git rev-parse HEAD) >> $GITHUB_OUTPUT - auto-tag: - name: Auto-Tag Release - needs: pre-flight - runs-on: ubuntu-latest - permissions: {} - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - repository: ${{ github.repository }} - token: ${{ secrets.PROJEN_GITHUB_TOKEN }} - ref: ${{ needs.pre-flight.outputs.sha }} - - name: Setup Node.js - uses: actions/setup-node@v4 - with: - cache: yarn - node-version: "18" - - name: Install dependencies - run: yarn install --frozen-lockfile - - name: Set git identity - run: |- - git config user.name "github-actions" - git config user.email "github-actions@github.com" - - name: Tag Release - run: yarn tag-release --idempotent --no-sign --push --release-line=5.2 diff --git a/.github/workflows/auto-tag-releases-v5.3.yml b/.github/workflows/auto-tag-releases-v5.3.yml index a1735bda..f2f812de 100644 --- a/.github/workflows/auto-tag-releases-v5.3.yml +++ b/.github/workflows/auto-tag-releases-v5.3.yml @@ -4,7 +4,7 @@ name: auto-tag-releases-v5.3 run-name: Auto-Tag Release (v5.3) on: schedule: - - cron: 0 10 * * 1 + - cron: 0 5 * * 1 workflow_dispatch: {} jobs: pre-flight: diff --git a/.github/workflows/upgrade-maintenance-v5.2.yml b/.github/workflows/upgrade-maintenance-v5.2.yml deleted file mode 100644 index c24615de..00000000 --- a/.github/workflows/upgrade-maintenance-v5.2.yml +++ /dev/null @@ -1,97 +0,0 @@ -# ~~ Generated by projen. To modify, edit .projenrc.ts and run "npx projen". - -name: upgrade-maintenance-v5.2 -on: - workflow_dispatch: {} - schedule: - - cron: 0 0 * * * -jobs: - upgrade: - name: Upgrade - runs-on: ubuntu-latest - permissions: - contents: read - outputs: - patch_created: ${{ steps.create_patch.outputs.patch_created }} - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - ref: maintenance/v5.2 - - name: Setup Node.js - uses: actions/setup-node@v4 - with: - node-version: lts/* - - name: Install dependencies - run: yarn install --check-files --frozen-lockfile - - name: Back-port projenrc changes from main - env: - CI: "false" - run: git fetch origin main && git checkout FETCH_HEAD -- README.md && yarn projen - - name: Upgrade dependencies - run: npx projen upgrade - - name: Find mutations - id: create_patch - run: |- - git add . - git diff --staged --patch --exit-code > .repo.patch || echo "patch_created=true" >> $GITHUB_OUTPUT - working-directory: ./ - - name: Upload patch - if: steps.create_patch.outputs.patch_created - uses: actions/upload-artifact@v4 - with: - name: .repo.patch - path: .repo.patch - overwrite: true - pr: - name: Create Pull Request - needs: upgrade - runs-on: ubuntu-latest - permissions: - contents: read - if: ${{ needs.upgrade.outputs.patch_created }} - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - ref: maintenance/v5.2 - - name: Download patch - uses: actions/download-artifact@v4 - with: - name: .repo.patch - path: ${{ runner.temp }} - - name: Apply patch - run: '[ -s ${{ runner.temp }}/.repo.patch ] && git apply ${{ runner.temp }}/.repo.patch || echo "Empty patch. Skipping."' - - name: Set git identity - run: |- - git config user.name "github-actions" - git config user.email "github-actions@github.com" - - name: Create Pull Request - id: create-pr - uses: peter-evans/create-pull-request@v6 - with: - token: ${{ secrets.PROJEN_GITHUB_TOKEN }} - commit-message: |- - chore(deps): upgrade dependencies - - Upgrades project dependencies. See details in [workflow run]. - - [Workflow Run]: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} - - ------ - - *Automatically created by projen via the "upgrade-maintenance-v5.2" workflow* - branch: github-actions/upgrade-maintenance-v5.2 - title: "chore(deps): upgrade dependencies" - labels: auto-approve - body: |- - Upgrades project dependencies. See details in [workflow run]. - - [Workflow Run]: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} - - ------ - - *Automatically created by projen via the "upgrade-maintenance-v5.2" workflow* - author: github-actions - committer: github-actions - signoff: true diff --git a/.gitignore b/.gitignore index 9662d9fe..f8262e71 100644 --- a/.gitignore +++ b/.gitignore @@ -43,7 +43,6 @@ jspm_packages/ /dist/ !/.eslintrc.json !/.github/workflows/upgrade-main.yml -!/.github/workflows/upgrade-maintenance-v5.2.yml !/.github/workflows/upgrade-maintenance-v5.3.yml /build-tools/tsconfig.json /projenrc/tsconfig.json @@ -59,8 +58,6 @@ jspm_packages/ !/.github/workflows/release.yml !/.github/workflows/auto-tag-dev.yml !/.github/workflows/auto-tag-releases.yml -!/.github/workflows/auto-tag-dev-v5.2.yml -!/.github/workflows/auto-tag-releases-v5.2.yml !/.github/workflows/auto-tag-dev-v5.3.yml !/.github/workflows/auto-tag-releases-v5.3.yml !/.backportrc.json diff --git a/.projen/files.json b/.projen/files.json index 7aa59b64..383473b7 100644 --- a/.projen/files.json +++ b/.projen/files.json @@ -6,10 +6,8 @@ ".github/pull_request_template.md", ".github/workflows/auto-approve.yml", ".github/workflows/auto-merge.yml", - ".github/workflows/auto-tag-dev-v5.2.yml", ".github/workflows/auto-tag-dev-v5.3.yml", ".github/workflows/auto-tag-dev.yml", - ".github/workflows/auto-tag-releases-v5.2.yml", ".github/workflows/auto-tag-releases-v5.3.yml", ".github/workflows/auto-tag-releases.yml", ".github/workflows/backport.yml", @@ -17,7 +15,6 @@ ".github/workflows/pull-request-lint.yml", ".github/workflows/release.yml", ".github/workflows/upgrade-main.yml", - ".github/workflows/upgrade-maintenance-v5.2.yml", ".github/workflows/upgrade-maintenance-v5.3.yml", ".gitignore", ".npmignore", diff --git a/yarn.lock b/yarn.lock index 426fdbf6..5b11ec09 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2396,9 +2396,9 @@ eastasianwidth@^0.2.0: integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA== electron-to-chromium@^1.4.796: - version "1.4.814" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.814.tgz#176535a0b899c9c473464502ab77576aa8bb1cbe" - integrity sha512-GVulpHjFu1Y9ZvikvbArHmAhZXtm3wHlpjTMcXNGKl4IQ4jMQjlnz8yMQYYqdLHKi/jEL2+CBC2akWVCoIGUdw== + version "1.4.815" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.815.tgz#e901b195c57c3e0fae8dc6d596e4188a33c3e82c" + integrity sha512-OvpTT2ItpOXJL7IGcYakRjHCt8L5GrrN/wHCQsRB4PQa1X9fe+X9oen245mIId7s14xvArCGSTIq644yPUKKLg== emittery@^0.13.1: version "0.13.1" @@ -6425,9 +6425,9 @@ typedarray-to-buffer@^3.1.5: is-typedarray "^1.0.0" typescript@next: - version "5.6.0-dev.20240628" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.6.0-dev.20240628.tgz#daee2175a51f71a3c5ec0f71ff885ca0b25162c4" - integrity sha512-XT57Gllario2IUjypenMgUbdHrNGtD52J13FyZckIC+h4ic13TllkJmoypbUr0HIYQ9IUB3SLq6/SaSBD4DoyQ== + version "5.6.0-dev.20240629" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.6.0-dev.20240629.tgz#74ad5a05341af44a8622df573a718721f73e9df9" + integrity sha512-DVoEWccO+qZrfMdy38YxomX9UGUkdMM+hbwIxI4rM3ZEGSQTpLn2kEULCsm6IKkfwkBcDjmCeYUO3mbvAVNnEA== typescript@~3.9.10: version "3.9.10"