From 5e598f3ba89bbfc75e32a550076be627b089cff7 Mon Sep 17 00:00:00 2001 From: Jesper Terkelsen Date: Mon, 19 Sep 2022 12:59:02 +0200 Subject: [PATCH 1/3] feat: mark team ownership in Tradeshift - mark team ownership in tradeshift - setup rebase automation --- .github/workflows/rebase.yml | 21 +++++++++++++++++++++ catalog-info.yml | 16 ++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 .github/workflows/rebase.yml create mode 100644 catalog-info.yml 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..f8054b85 --- /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: developer-productivity + lifecycle: production From 6c6d365be56e253670c642cac9444c3fc67312cb Mon Sep 17 00:00:00 2001 From: Celio Ferreira Date: Mon, 6 Mar 2023 14:58:18 +0100 Subject: [PATCH 2/3] chore: change of ownership dev-prod --- catalog-info.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalog-info.yml b/catalog-info.yml index f8054b85..be27606f 100644 --- a/catalog-info.yml +++ b/catalog-info.yml @@ -12,5 +12,5 @@ metadata: - fork spec: type: library - owner: developer-productivity + owner: sre lifecycle: production From 6a922736a3d98b2957506abb30796a4181e39e62 Mon Sep 17 00:00:00 2001 From: "tradeshift-renovate[bot]" <121954292+tradeshift-renovate[bot]@users.noreply.github.com> Date: Wed, 15 Jan 2025 16:50:54 +0000 Subject: [PATCH 3/3] chore(deps): update dependency eslint-plugin-prettier to ^5.2.2 --- package-lock.json | 9 +++++---- package.json | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 714c1a73..73f81406 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,7 +21,7 @@ "eslint": "^8.57.1", "eslint-plugin-github": "^4.10.2", "eslint-plugin-jest": "^27.9.0", - "eslint-plugin-prettier": "^5.2.1", + "eslint-plugin-prettier": "^5.2.2", "jest": "^27.5.1", "jest-circus": "^27.5.1", "js-yaml": "^4.1.0", @@ -3458,10 +3458,11 @@ } }, "node_modules/eslint-plugin-prettier": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.2.1.tgz", - "integrity": "sha512-gH3iR3g4JfF+yYPaJYkN7jEl9QbweL/YfkoRlNnuIEHEz1vHVlCmWOS+eGGiRuzHQXdJFCOTxRgvju9b8VUmrw==", + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.2.2.tgz", + "integrity": "sha512-1yI3/hf35wmlq66C8yOyrujQnel+v5l1Vop5Cl2I6ylyNTT1JbuUUnV3/41PzwTzcyDp/oF0jWE3HXvcH5AQOQ==", "dev": true, + "license": "MIT", "dependencies": { "prettier-linter-helpers": "^1.0.0", "synckit": "^0.9.1" diff --git a/package.json b/package.json index 9ceebd82..60671399 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "eslint": "^8.57.1", "eslint-plugin-github": "^4.10.2", "eslint-plugin-jest": "^27.9.0", - "eslint-plugin-prettier": "^5.2.1", + "eslint-plugin-prettier": "^5.2.2", "jest": "^27.5.1", "jest-circus": "^27.5.1", "js-yaml": "^4.1.0",