diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml new file mode 100644 index 00000000..126f9593 --- /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/catalog-info.yml b/catalog-info.yml new file mode 100644 index 00000000..be27606f --- /dev/null +++ b/catalog-info.yml @@ -0,0 +1,16 @@ +apiVersion: backstage.io/v1alpha1 +kind: Component +metadata: + name: actions-create-or-update-comment + description: | + A GitHub action to create or update an issue or pull request comment + annotations: + github.com/project-slug: Tradeshift/actions-create-or-update-comment + tags: + - github-action + - nodejs + - fork +spec: + type: library + owner: sre + lifecycle: production diff --git a/package-lock.json b/package-lock.json index 41585b38..a2214f57 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,7 +25,7 @@ "jest": "^27.5.1", "jest-circus": "^27.5.1", "js-yaml": "^4.1.0", - "prettier": "^3.4.1", + "prettier": "^3.4.2", "ts-jest": "^27.1.5", "typescript": "^4.9.5" } @@ -6161,10 +6161,11 @@ } }, "node_modules/prettier": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.4.1.tgz", - "integrity": "sha512-G+YdqtITVZmOJje6QkXQWzl3fSfMxFwm1tjTyo9exhkmWSqC4Yhd1+lug++IlR2mvRVAxEDDWYkQdeSztajqgg==", + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.4.2.tgz", + "integrity": "sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==", "dev": true, + "license": "MIT", "bin": { "prettier": "bin/prettier.cjs" }, diff --git a/package.json b/package.json index b46be6d6..5c40bc08 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "jest": "^27.5.1", "jest-circus": "^27.5.1", "js-yaml": "^4.1.0", - "prettier": "^3.4.1", + "prettier": "^3.4.2", "ts-jest": "^27.1.5", "typescript": "^4.9.5" }