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 96bfb3bf8c..932fb85b9c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -32,7 +32,7 @@ "jest-circus": "^29.4.2", "jest-environment-jsdom": "^29.5.0", "js-yaml": "^4.1.0", - "prettier": "^2.8.7", + "prettier": "^2.8.8", "ts-jest": "^29.1.0", "typescript": "^4.9.5" } @@ -6130,9 +6130,9 @@ } }, "node_modules/prettier": { - "version": "2.8.7", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.7.tgz", - "integrity": "sha512-yPngTo3aXUUmyuTjeTUT75txrf+aMh9FiD7q9ZE/i6r0bPb22g4FsE6Y338PQX1bmfy08i9QQCB7/rcUAVntfw==", + "version": "2.8.8", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", + "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", "dev": true, "bin": { "prettier": "bin-prettier.js" diff --git a/package.json b/package.json index 6f8a55e980..1ea8e1ac7b 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "jest-circus": "^29.4.2", "jest-environment-jsdom": "^29.5.0", "js-yaml": "^4.1.0", - "prettier": "^2.8.7", + "prettier": "^2.8.8", "ts-jest": "^29.1.0", "typescript": "^4.9.5" }