diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml new file mode 100644 index 0000000000..126f959358 --- /dev/null +++ b/.github/workflows/rebase.yml @@ -0,0 +1,21 @@ +name: Rebase Upstream +on: + schedule: + - cron: "0 0 * * 0" # run once a week + workflow_dispatch: # run manually + +jobs: + sync: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@master + with: + fetch-depth: 0 # fetching all history so i can rebase + token: ${{ secrets.GH_TOKEN }} + - name: Configure git for tradeshiftci + uses: tradeshift/actions-git/configure-from-gpg-key@v1 + with: + gpg-key: ${{ secrets.TRADESHIFTCI_GPG_KEY }} + - uses: tradeshift/rebase-upstream-action@master + with: + branch: main diff --git a/Repofile b/Repofile new file mode 100644 index 0000000000..330072c5b7 --- /dev/null +++ b/Repofile @@ -0,0 +1,9 @@ +{ + "checks": ["build"], + "maintainers": [ + "Developer productivity" + ], + "topics": [ + "github-action" + ] +} \ No newline at end of file diff --git a/catalog-info.yml b/catalog-info.yml new file mode 100644 index 0000000000..e2d2489eac --- /dev/null +++ b/catalog-info.yml @@ -0,0 +1,15 @@ +apiVersion: backstage.io/v1alpha1 +kind: Component +metadata: + name: create-pull-request + description: | + A GitHub action to create a pull request for changes to your repository in the actions workspace + annotations: + github.com/project-slug: Tradeshift/create-pull-request + tags: + - nodejs + - github-action +spec: + type: other + lifecycle: production + owner: sre diff --git a/package-lock.json b/package-lock.json index 6441497124..3868ac914a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -39,7 +39,7 @@ "js-yaml": "^4.1.1", "prettier": "^3.8.3", "ts-jest": "^29.4.9", - "typescript": "^5.9.3", + "typescript": "^6.0.3", "undici": "^6.25.0" }, "engines": { @@ -8900,9 +8900,9 @@ } }, "node_modules/typescript": { - "version": "5.9.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz", - "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.3.tgz", + "integrity": "sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==", "dev": true, "license": "Apache-2.0", "bin": { diff --git a/package.json b/package.json index 94d4667b93..0bd502c816 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "js-yaml": "^4.1.1", "prettier": "^3.8.3", "ts-jest": "^29.4.9", - "typescript": "^5.9.3", + "typescript": "^6.0.3", "undici": "^6.25.0" } }