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..6eb769f9 --- /dev/null +++ b/catalog-info.yml @@ -0,0 +1,16 @@ +apiVersion: backstage.io/v1alpha1 +kind: Component +metadata: + name: actions-junit-report + description: | + Reports junit test results as GitHub Pull Request Check + annotations: + github.com/project-slug: Tradeshift/actions-junit-report + tags: + - github-action + - nodejs + - fork +spec: + type: library + owner: sre + lifecycle: production diff --git a/package-lock.json b/package-lock.json index bac2ab04..a3d9de78 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,7 +30,7 @@ "eslint-plugin-import": "^2.31.0", "eslint-plugin-jest": "^28.9.0", "eslint-plugin-prettier": "^5.2.1", - "globals": "^15.12.0", + "globals": "^15.13.0", "jest": "^29.7.0", "jest-circus": "^29.7.0", "js-yaml": "^4.1.0", @@ -4399,9 +4399,9 @@ "license": "BSD-2-Clause" }, "node_modules/globals": { - "version": "15.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-15.12.0.tgz", - "integrity": "sha512-1+gLErljJFhbOVyaetcwJiJ4+eLe45S2E7P5UiZ9xGfeq3ATQf5DOv9G7MH3gGbKQLkzmNh2DxfZwLdw+j6oTQ==", + "version": "15.13.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-15.13.0.tgz", + "integrity": "sha512-49TewVEz0UxZjr1WYYsWpPrhyC/B/pA8Bq0fUmet2n+eR7yn0IvNzNaoBwnK6mdkzcN+se7Ez9zUgULTz2QH4g==", "dev": true, "license": "MIT", "engines": { diff --git a/package.json b/package.json index d29fb5f2..c7495482 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "eslint-plugin-import": "^2.31.0", "eslint-plugin-jest": "^28.9.0", "eslint-plugin-prettier": "^5.2.1", - "globals": "^15.12.0", + "globals": "^15.13.0", "jest": "^29.7.0", "jest-circus": "^29.7.0", "js-yaml": "^4.1.0",