Skip to content

Commit

Permalink
Merge branch 'main' into bug/TypeErrors-instead-of-not-found
Browse files Browse the repository at this point in the history
  • Loading branch information
machour authored Apr 26, 2023
2 parents 1016dcd + 11f2d6b commit 57fc1c7
Show file tree
Hide file tree
Showing 270 changed files with 12,495 additions and 5,449 deletions.
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ module.exports = {
"no-undef": OFF,
"no-unused-expressions": OFF,
"no-unused-vars": OFF,
"@typescript-eslint/no-redeclare": OFF,
},
},
{
Expand Down
25 changes: 4 additions & 21 deletions .github/workflows/deployments.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,16 @@ on:
TEST_VERCEL_USER_ID:
required: true

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
arc_deploy:
name: Architect Deploy
if: github.repository == 'remix-run/remix'
runs-on: ubuntu-latest
steps:
- name: 🛑 Cancel Previous Runs
uses: styfle/[email protected]

- name: ⬇️ Checkout repo
uses: actions/checkout@v3

Expand Down Expand Up @@ -71,9 +72,6 @@ jobs:
if: github.repository == 'remix-run/remix'
runs-on: ubuntu-latest
steps:
- name: 🛑 Cancel Previous Runs
uses: styfle/[email protected]

- name: ⬇️ Checkout repo
uses: actions/checkout@v3

Expand Down Expand Up @@ -109,9 +107,6 @@ jobs:
if: github.repository == 'remix-run/remix'
runs-on: ubuntu-latest
steps:
- name: 🛑 Cancel Previous Runs
uses: styfle/[email protected]

- name: ⬇️ Checkout repo
uses: actions/checkout@v3

Expand Down Expand Up @@ -148,9 +143,6 @@ jobs:
if: github.repository == 'remix-run/remix'
runs-on: ubuntu-latest
steps:
- name: 🛑 Cancel Previous Runs
uses: styfle/[email protected]

- name: ⬇️ Checkout repo
uses: actions/checkout@v3

Expand Down Expand Up @@ -190,9 +182,6 @@ jobs:
if: github.repository == 'remix-run/remix'
runs-on: ubuntu-latest
steps:
- name: 🛑 Cancel Previous Runs
uses: styfle/[email protected]

- name: ⬇️ Checkout repo
uses: actions/checkout@v3

Expand Down Expand Up @@ -228,9 +217,6 @@ jobs:
if: github.repository == 'remix-run/remix'
runs-on: ubuntu-latest
steps:
- name: 🛑 Cancel Previous Runs
uses: styfle/[email protected]

- name: ⬇️ Checkout repo
uses: actions/checkout@v3

Expand Down Expand Up @@ -263,9 +249,6 @@ jobs:
if: github.repository == 'remix-run/remix'
runs-on: ubuntu-latest
steps:
- name: 🛑 Cancel Previous Runs
uses: styfle/[email protected]

- name: ⬇️ Checkout repo
uses: actions/checkout@v3

Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,16 @@ on:
- main
- dev

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
format:
if: github.repository == 'remix-run/remix'
runs-on: ubuntu-latest

steps:
- name: 🛑 Cancel Previous Runs
uses: styfle/[email protected]

- name: ⬇️ Checkout repo
uses: actions/checkout@v3
with:
Expand Down
16 changes: 9 additions & 7 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,15 @@ on:
- dev
pull_request:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
lint:
name: ⬣ Lint
runs-on: ubuntu-latest
steps:
- name: 🛑 Cancel Previous Runs
uses: styfle/[email protected]

- name: ⬇️ Checkout repo
uses: actions/checkout@v3

Expand All @@ -24,14 +25,15 @@ jobs:
node-version-file: ".nvmrc"
cache: "yarn"

- name: 📥 Install deps
run: yarn --frozen-lockfile

- name: Disable Eslint GitHub Actions Annotations
- name: Disable GitHub Actions Annotations
run: |
echo "::remove-matcher owner=tsc::"
echo "::remove-matcher owner=eslint-compact::"
echo "::remove-matcher owner=eslint-stylish::"
- name: 📥 Install deps
run: yarn --frozen-lockfile

- name: 🔬 Lint
run: yarn lint

Expand Down
24 changes: 0 additions & 24 deletions .github/workflows/merged-pr.yml

This file was deleted.

11 changes: 4 additions & 7 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ on:
schedule:
- cron: "0 7 * * *" # every day at 12AM PST

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

env:
CI: true

Expand All @@ -22,9 +26,6 @@ jobs:
# allows this to be used in the `comment` job below - will be undefined if there's no release necessary
NEXT_VERSION: ${{ steps.version.outputs.NEXT_VERSION }}
steps:
- name: 🛑 Cancel Previous Runs
uses: styfle/[email protected]

- name: ⬇️ Checkout repo
uses: actions/checkout@v3
with:
Expand Down Expand Up @@ -95,10 +96,6 @@ jobs:
name: 📝 Comment on related issues and pull requests
if: github.repository == 'remix-run/remix' && needs.nightly.outputs.NEXT_VERSION
uses: ./.github/workflows/release-comments.yml
with:
ref: "refs/tags/v${{ needs.nightly.outputs.NEXT_VERSION }}"
package_version_to_follow: "remix"
release_branch: "dev"

deployments:
needs: [nightly]
Expand Down
31 changes: 19 additions & 12 deletions .github/workflows/no-response.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,27 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: 🥺 Handle Ghosting
uses: actions/stale@v7
uses: actions/stale@v8
with:
days-before-close: 10
close-issue-message: >
This issue has been automatically closed because we haven't received a
response from the original author 🙈. This automation helps keep the issue
tracker clean from issues that are unactionable. Please reach out if you
have more information for us! 🙂
This issue has been automatically closed because we didn't hear
anything from the original author after the previous notice.
close-pr-message: >
This PR has been automatically closed because we haven't received a
response from the original author 🙈. This automation helps keep the issue
tracker clean from PRs that are unactionable. Please reach out if you
have more information for us! 🙂
# don't automatically mark issues/PRs as stale
days-before-stale: -1
This PR has been automatically closed because we didn't hear
anything from the original author after the previous notice.
stale-issue-label: needs-response
stale-issue-message: >
This issue has been automatically marked stale because we haven't
received a response from the original author in a while 🙈. This
automation helps keep the issue tracker clean from issues that are
not actionable. Please reach out if you have more information for us
or you think this issue shouldn't be closed! 🙂 If you don't do so
within 7 days, this issue will be automatically closed.
stale-pr-label: needs-response
stale-pr-message: >
This PR has been automatically marked stale because we haven't
received a response from the original author in a while 🙈. This
automation helps keep the issue tracker clean from issues that are
not actionable. Please reach out if you have more information for us
or you think this issue shouldn't be closed! 🙂 If you don't do so
within 7 days, this PR will be automatically closed.
38 changes: 7 additions & 31 deletions .github/workflows/release-comments.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,44 +2,20 @@ name: 📝 Comment on Release

on:
workflow_call:
inputs:
ref:
required: true
type: string
package_version_to_follow:
required: true
type: string
release_branch:
required: true
type: string

jobs:
comment:
name: Comment on Release
name: 📝 Comment on related issues and pull requests
if: github.repository == 'remix-run/remix'
runs-on: ubuntu-latest
steps:
- name: ⬇️ Checkout repo
uses: actions/checkout@v3

- name: ⎔ Setup node
uses: actions/setup-node@v3
with:
node-version-file: ".nvmrc"
cache: "npm"
cache-dependency-path: scripts/release/package-lock.json

- name: 📥 Install deps
run: npm ci
working-directory: ./scripts/release
fetch-depth: 0

- name: 📝 Comment on issues
working-directory: ./scripts/release
run: node -r esbuild-register ./comment.ts
env:
GITHUB_REPOSITORY: ${{ github.repository }}
GITHUB_TOKEN: ${{ github.token }}
VERSION: ${{ inputs.ref }}
DEFAULT_BRANCH: "main"
RELEASE_BRANCH: ${{ inputs.release_branch }}
PACKAGE_VERSION_TO_FOLLOW: ${{ inputs.package_version_to_follow }}
- name: 📝 Comment on related issues and pull requests
uses: mcansh/[email protected]
with:
DIRECTORY_TO_CHECK: "./packages"
PACKAGE_NAME: "remix"
19 changes: 6 additions & 13 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ on:
- "!release-manual"
- "!release-manual-*"

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
release:
name: 🦋 Changesets Release
Expand All @@ -24,14 +28,10 @@ jobs:
published_packages: ${{ steps.changesets.outputs.publishedPackages }}
published: ${{ steps.changesets.outputs.published }}
steps:
- name: 🛑 Cancel Previous Runs
uses: styfle/[email protected]

- name: ⬇️ Checkout repo
uses: actions/checkout@v3
with:
fetch-depth: 0
token: ${{ secrets.NIGHTLY_PAT }}

- name: ⎔ Setup node
uses: actions/setup-node@v3
Expand Down Expand Up @@ -62,7 +62,7 @@ jobs:
publish: yarn run changeset:release
createGithubReleases: false
env:
GITHUB_TOKEN: ${{ secrets.NIGHTLY_PAT }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

find_package_version:
Expand All @@ -73,9 +73,6 @@ jobs:
outputs:
package_version: ${{ steps.find_package_version.outputs.package_version }}
steps:
- name: 🛑 Cancel Previous Runs
uses: styfle/[email protected]

- name: ⬇️ Checkout repo
uses: actions/checkout@v3

Expand All @@ -87,7 +84,7 @@ jobs:

- id: find_package_version
run: |
package_version=$(node ./scripts/release/find-release-from-changeset.js)
package_version=$(node ./scripts/find-release-from-changeset.js)
echo "package_version=${package_version}" >> $GITHUB_OUTPUT
env:
PACKAGE_VERSION_TO_FOLLOW: "remix"
Expand All @@ -98,10 +95,6 @@ jobs:
if: github.repository == 'remix-run/remix' && needs.find_package_version.outputs.package_version != ''
needs: [release, find_package_version]
uses: ./.github/workflows/release-comments.yml
with:
ref: refs/tags/remix@${{ needs.find_package_version.outputs.package_version }}
package_version_to_follow: "remix"
release_branch: ${{ github.ref_name }}

deployments:
name: 🚀 Deployment Tests
Expand Down
Loading

0 comments on commit 57fc1c7

Please sign in to comment.