neo4j · darrellwarde · Jan 26, 2024 · Jan 26, 2024
@@ -11,7 +11,6 @@ on:
   pull_request_target:
     branches:
       - dev
-      - master
     paths:
       - "**/CHANGELOG.md"
 

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - dev
-      - master
       - '*.*.*'
 
 concurrency: ${{ github.workflow }}-${{ github.ref }}
@@ -83,62 +82,3 @@ jobs:
           payload: '{"version":"${{ matrix.package.version }}"}'
         env:
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_RELEASE_ANNOUNCEMENT_WEBHOOK_URL }}
-
-  # If a normal release off dev was done, we need to merge into master
-  merge-dev-into-master:
-    needs:
-      - release
-
-    if: ${{ github.ref_name == 'dev' && needs.release.outputs.published == 'true' }}
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
-        with:
-          ref: master
-          fetch-depth: 0
-          token: ${{ secrets.NEO4J_TEAM_GRAPHQL_PERSONAL_ACCESS_TOKEN }}
-
-      - name: Configure git
-        run: |
-          git config --global user.name 'Neo4j Team GraphQL'
-          git config --global user.email 'team-graphql@neotechnology.com'
-
-      - name: Merge into master if publish happens
-        if: needs.release.outputs.published == 'true'
-        run: |
-          git merge --no-ff origin/dev --strategy-option theirs
-          git push
-
-  # If a hotfix off master was done, we need to merge into dev
-  merge-master-into-dev:
-    needs:
-      - release
-
-    if: ${{ github.ref_name == 'master' && needs.release.outputs.published == 'true' }}
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout Repo
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
-        with:
-          fetch-depth: 0
-
-      - name: Create release branch for merging into dev
-        if: needs.release.outputs.published == 'true'
-        uses: peterjgrainger/action-create-branch@08259812c8ebdbf1973747f9297e332fa078d3c1 # v2.4.0
-        env:
-          GITHUB_TOKEN: ${{ secrets.NEO4J_TEAM_GRAPHQL_PERSONAL_ACCESS_TOKEN }}
-        with:
-          branch: "release/${{ github.sha }}"
-
-      - name: pull-request
-        if: needs.release.outputs.published == 'true'
-        uses: repo-sync/pull-request@7e79a9f5dc3ad0ce53138f01df2fad14a04831c5 # v2.12.1
-        with:
-          source_branch: "release/${{ github.sha }}"
-          destination_branch: "dev"
-          pr_title: "Merge ${{ github.ref_name }} into dev"
-          github_token: ${{ secrets.NEO4J_TEAM_GRAPHQL_PERSONAL_ACCESS_TOKEN }}
@@ -4,7 +4,6 @@ on:
   pull_request_target:
     branches:
       - dev
-      - master
 
 jobs:
   cla-check:

@@ -51,16 +51,3 @@ jobs:
           project: Bug Triage
           column: Confirmed
           repo-token: ${{ secrets.NEO4J_TEAM_GRAPHQL_PERSONAL_ACCESS_TOKEN }}
-  add_high_priority_comment:
-    if: ${{ github.event.label.name == 'high priority' }}
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Add comment
-        uses: peter-evans/create-or-update-comment@23ff15729ef2fc348714a3bb66d2f655ca9066f2 # v3.1.0
-        with:
-          token: ${{ secrets.NEO4J_TEAM_GRAPHQL_PERSONAL_ACCESS_TOKEN }}
-          issue-number: ${{ github.event.issue.number }}
-          body: |
-            This bug report has been assigned high priority to fix. If you wish to contribute a fix, please branch from `master` and submit your PR with the base set to `master`. Thanks!
@@ -4,7 +4,6 @@ on:
   pull_request_target:
     branches:
       - dev
-      - master
 
 jobs:
   label:

@@ -4,7 +4,6 @@ on:
   pull_request:
     branches:
       - dev
-      - master
     paths:
       - "**/*.md"
 

@@ -4,7 +4,6 @@ on:
   pull_request:
     branches:
       - dev
-      - master
       - "*.*.*"
     paths:
       - "packages/graphql/tests/tck/**"

@@ -8,7 +8,6 @@ on:
   pull_request:
     branches:
       - dev
-      - master
       - "*.*.*"
     paths-ignore:
       - "docs/**"

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - dev
-      - master
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 

diff --git a/README.md b/README.md
@@ -18,9 +18,6 @@
 The default branch for this repository is `dev`, which contains changes for the next
 release. This is what you should base your work on if you want to make changes.
 
-Want to check out the code from the last release? Checkout `master` instead, which
-is only ever merged into on releases.
-
 Want to contribute to `@neo4j/graphql`? See our [contributing guide](./CONTRIBUTING.md)
 and [development guide](./docs/contributing/DEVELOPING.md) to get started!
 

diff --git a/package.json b/package.json
@@ -21,7 +21,6 @@
         "test-docker": "docker-compose up --build --abort-on-container-exit",
         "prepare": "husky install",
         "changeset-version-dev": "changeset version --since dev && yarn",
-        "changeset-version-master": "changeset version --since master && yarn",
         "release": "yarn build && changeset publish"
     },
     "devDependencies": {

diff --git a/packages/graphql-toolbox/README.md b/packages/graphql-toolbox/README.md
@@ -20,7 +20,7 @@ Experiment with your Neo4j GraphQL API.
 
 ## Link
 
-Access the Neo4j GraphQL Toolbox here: https://graphql-toolbox.neo4j.io/
+Access the Neo4j GraphQL Toolbox here: <https://graphql-toolbox.neo4j.io/>
 
 ## Usage
 
@@ -43,7 +43,7 @@ then `cd` into the graphql-toolbox package.
 cd packages/graphql-toolbox
 ```
 
-Run this command to start the development server. See the output in the console & navigate to the default webpack server at: http://localhost:4242
+Run this command to start the development server. See the output in the console & navigate to the default webpack server at: <http://localhost:4242>
 
 ```
 yarn start
@@ -69,4 +69,4 @@ Note: The plus symbol (+) in the connectURL needs to be URL encoded to become `%
 
 ## License
 
-[Apache 2.0](https://github.com/neo4j/graphql/blob/master/packages/toolbox/LICENSE.txt)
+[Apache 2.0](https://github.com/neo4j/graphql/blob/dev/packages/toolbox/LICENSE.txt)
diff --git a/packages/graphql/README.md b/packages/graphql/README.md
@@ -19,13 +19,13 @@ A GraphQL to Cypher query execution layer for Neo4j and JavaScript GraphQL imple
 ## Installation
 
 ```
-$ npm install @neo4j/graphql
+npm install @neo4j/graphql
 ```
 
 ⚠ `graphql` & `neo4j-driver` are **peerDependency**(s)
 
 ```
-$ npm install graphql neo4j-driver
+npm install graphql neo4j-driver
 ```
 
 ## Importing
@@ -190,4 +190,4 @@ type Invoice @auth(rules: [{ operations: [READ], roles: ["read:invoice"] }]) {
 
 ## Licence
 
-[Apache 2.0](https://github.com/neo4j/graphql/blob/master/packages/graphql/LICENSE.txt)
+[Apache 2.0](https://github.com/neo4j/graphql/blob/dev/packages/graphql/LICENSE.txt)
diff --git a/packages/ogm/README.md b/packages/ogm/README.md
@@ -19,13 +19,13 @@ GraphQL powered OGM for Neo4j and Javascript applications.
 ## Installation
 
 ```
-$ npm install @neo4j/graphql-ogm
+npm install @neo4j/graphql-ogm
 ```
 
 ⚠ `graphql` & `neo4j-driver` are **peerDependency**(s)
 
 ```
-$ npm install graphql neo4j-driver
+npm install graphql neo4j-driver
 ```
 
 ## Importing
@@ -64,4 +64,4 @@ async function main() {
 
 ## Licence
 
-[Apache 2.0](https://github.com/neo4j/graphql/blob/master/packages/ogm/LICENSE.txt)
+[Apache 2.0](https://github.com/neo4j/graphql/blob/dev/packages/ogm/LICENSE.txt)
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,6 @@ on: @@
       pull_request_target:
         branches:
           - dev
-          - master
         paths:
           - "**/CHANGELOG.md"
@@ Expand Down @@