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 e1c1131146..122ea07aac 100644 --- a/package-lock.json +++ b/package-lock.json @@ -35,8 +35,8 @@ "jest-circus": "^29.7.0", "jest-environment-jsdom": "^29.7.0", "js-yaml": "^4.1.1", - "prettier": "^3.7.3", - "ts-jest": "^29.4.5", + "prettier": "^3.7.4", + "ts-jest": "^29.4.6", "typescript": "^5.9.3", "undici": "^6.22.0" }, @@ -7234,9 +7234,9 @@ } }, "node_modules/prettier": { - "version": "3.7.3", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.7.3.tgz", - "integrity": "sha512-QgODejq9K3OzoBbuyobZlUhznP5SKwPqp+6Q6xw6o8gnhr4O85L2U915iM2IDcfF2NPXVaM9zlo9tdwipnYwzg==", + "version": "3.7.4", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.7.4.tgz", + "integrity": "sha512-v6UNi1+3hSlVvv8fSaoUbggEM5VErKmmpGA7Pl3HF8V6uKY7rvClBOJlH6yNwQtfTueNkGVpOv/mtWL9L4bgRA==", "dev": true, "license": "MIT", "peer": true, @@ -8179,9 +8179,9 @@ } }, "node_modules/ts-jest": { - "version": "29.4.5", - "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.4.5.tgz", - "integrity": "sha512-HO3GyiWn2qvTQA4kTgjDcXiMwYQt68a1Y8+JuLRVpdIzm+UOLSHgl/XqR4c6nzJkq5rOkjc02O2I7P7l/Yof0Q==", + "version": "29.4.6", + "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.4.6.tgz", + "integrity": "sha512-fSpWtOO/1AjSNQguk43hb/JCo16oJDnMJf3CdEGNkqsEX3t0KX96xvyX1D7PfLCpVoKu4MfVrqUkFyblYoY4lA==", "dev": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index b957b29860..735e2a8e46 100644 --- a/package.json +++ b/package.json @@ -58,8 +58,8 @@ "jest-circus": "^29.7.0", "jest-environment-jsdom": "^29.7.0", "js-yaml": "^4.1.1", - "prettier": "^3.7.3", - "ts-jest": "^29.4.5", + "prettier": "^3.7.4", + "ts-jest": "^29.4.6", "typescript": "^5.9.3", "undici": "^6.22.0" }