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 789a5359bd..548a23c9d0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34,7 +34,7 @@ "jest-environment-jsdom": "^29.7.0", "js-yaml": "^4.1.0", "prettier": "^3.3.3", - "ts-jest": "^29.2.4", + "ts-jest": "^29.2.5", "typescript": "^4.9.5" } }, @@ -1646,6 +1646,7 @@ "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.45.tgz", "integrity": "sha512-VZxPKNNhjKmaC1SUYowuXSRSMGyQGmQjvvA1xE4QZ0xce2kLtEhPDS+kqpCPBZYgqblCLQ2DAjSzmgCM5auvhA==", "dev": true, + "license": "MIT", "dependencies": { "undici-types": "~5.26.4" } @@ -6128,18 +6129,6 @@ "integrity": "sha1-E2Xt9DFIBIHvDRxolXpe2Z1J984=", "dev": true }, - "node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/make-dir": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz", @@ -7054,13 +7043,11 @@ } }, "node_modules/semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, + "license": "ISC", "bin": { "semver": "bin/semver.js" }, @@ -7463,20 +7450,21 @@ } }, "node_modules/ts-jest": { - "version": "29.2.4", - "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.2.4.tgz", - "integrity": "sha512-3d6tgDyhCI29HlpwIq87sNuI+3Q6GLTTCeYRHCs7vDz+/3GCMwEtV9jezLyl4ZtnBgx00I7hm8PCP8cTksMGrw==", + "version": "29.2.5", + "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.2.5.tgz", + "integrity": "sha512-KD8zB2aAZrcKIdGk4OwpJggeLcH1FgrICqDSROWqlnJXGCXK4Mn6FcdK2B6670Xr73lHMG1kHw8R87A0ecZ+vA==", "dev": true, + "license": "MIT", "dependencies": { - "bs-logger": "0.x", + "bs-logger": "^0.2.6", "ejs": "^3.1.10", - "fast-json-stable-stringify": "2.x", + "fast-json-stable-stringify": "^2.1.0", "jest-util": "^29.0.0", "json5": "^2.2.3", - "lodash.memoize": "4.x", - "make-error": "1.x", - "semver": "^7.5.3", - "yargs-parser": "^21.0.1" + "lodash.memoize": "^4.1.2", + "make-error": "^1.3.6", + "semver": "^7.6.3", + "yargs-parser": "^21.1.1" }, "bin": { "ts-jest": "cli.js" @@ -8012,12 +8000,6 @@ "node": ">=10" } }, - "node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - }, "node_modules/yargs": { "version": "17.7.2", "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", diff --git a/package.json b/package.json index 0351695397..8968a5a0b1 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "jest-environment-jsdom": "^29.7.0", "js-yaml": "^4.1.0", "prettier": "^3.3.3", - "ts-jest": "^29.2.4", + "ts-jest": "^29.2.5", "typescript": "^4.9.5" } }