fix conflict

JoshuaNitschke · Mar 15, 2024 · e9326c7 · e9326c7
2 parents 839709b + 4501805
commit e9326c7
Show file tree

Hide file tree

Showing 1,255 changed files with 55,932 additions and 100,723 deletions.
diff --git a/.github/workflows/docs-prs.yml b/.github/workflows/docs-prs.yml
@@ -7,13 +7,13 @@ on:
   pull_request:
     branches:
       - master
-      
+
 jobs:
   linting:
     name: "Markdown linting"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         name: Check out the code
       - name: Lint Code Base
         uses: docker://ghcr.io/igorshubovych/markdownlint-cli:latest
@@ -23,12 +23,12 @@ jobs:
     name: "Spell check"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         name: Check out the code
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         name: Setup node
         with:
-          node-version: "16"
+          node-version: 18
       - run: npm install -g cspell
         name: Install cSpell
       - run: cspell --config ./docs/cSpell.json "docs/**/*.md"

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -2,19 +2,20 @@ name: Docs build and deploy
 
 on:
   # run it on push to the default repository branch
-  push:
-     branches: [master]
+  # push:
+  #   branches: [ master ]
   workflow_dispatch:
     inputs:
       publish_docs:
         description: 'Publish docs'
         type: boolean
+        default: true
 
 env:
   config: Release
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
-  node_version: 16.x
+  node_version: 18.x
 
 jobs:
   build-and-test-code:
@@ -26,39 +27,35 @@ jobs:
       # define the test matrix
       matrix:
         # selected operation systems to run CI
-        os: [ubuntu-latest]
+        os: [ ubuntu-latest ]
 
     steps:
-      - uses: actions/checkout@v3
-
-      - name: Install .NET 7.0.x
-        uses: actions/setup-dotnet@v3
-        with:
-          dotnet-version: 7.0.x
-
+      - uses: actions/checkout@v4
       - name: Install Node.js
         uses: actions/setup-node@v3
         with:
           node-version: ${{ env.node_version }}
 
       - name: Build & Deploy docs preview
-        run: ./build.sh --no-color publish-docs-preview
+        run: |
+          ./build.sh --no-color publish-docs-preview
         if: ${{ github.ref != 'refs/heads/master' && github.event.inputs.publish_docs == 'true' }}
         env:
           NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
           NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
 
       - name: Build & Deploy docs
-        run: ./build.sh --no-color publish-docs
+        run: |
+          ./build.sh --no-color publish-docs
         if: ${{ github.ref == 'refs/heads/master' && (github.event_name == 'push' || github.event.inputs.publish_docs == 'true') }}
         env:
           NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
           NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
 
-      - name: Generate Algolia DocSearch index
-        uses: darrenjennings/algolia-docsearch-action@master
-        if: ${{ github.ref == 'refs/heads/master' && (github.event_name == 'push' || github.event.inputs.publish_docs == 'true') }}
-        with:
-          algolia_application_id: ${{ secrets.ALGOLIA_APPLICATION_ID }}
-          algolia_api_key: ${{ secrets.ALGOLIA_API_KEY }}
-          file: 'docs/.vitepress/algolia-config.json'
+      # - name: Generate Algolia DocSearch index
+      #   uses: darrenjennings/algolia-docsearch-action@master
+      #   if: ${{ github.ref == 'refs/heads/master' && (github.event_name == 'push' || github.event.inputs.publish_docs == 'true') }}
+      #   with:
+      #     algolia_application_id: ${{ secrets.ALGOLIA_APPLICATION_ID }}
+      #     algolia_api_key: ${{ secrets.ALGOLIA_API_KEY }}
+      #     file: 'docs/.vitepress/algolia-config.json'
diff --git a/.github/workflows/on-manual-do-nuget-publish.yml b/.github/workflows/on-manual-do-nuget-publish.yml
@@ -1,6 +1,6 @@
 name: Marten NuGet Manual Publish
 
-on: [workflow_dispatch]
+on: [ workflow_dispatch ]
 
 env:
   config: Release
@@ -14,12 +14,12 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
-      - name: Install .NET 7.0.x
+      - name: Install .NET 8.0.x
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 7.0.x
+          dotnet-version: 8.0.x
 
       - name: Run Pack
         run: ./build.sh --no-color pack

diff --git a/.github/workflows/on-push-do-ci-build-pg10.yml b/.github/workflows/on-push-do-ci-build-pg10.yml
diff --git a/...ws/on-push-do-ci-build-systemtextjson.yml → ...on-push-do-ci-build-pg12-plv8-jsonnet.yml b/...ws/on-push-do-ci-build-systemtextjson.yml → ...on-push-do-ci-build-pg12-plv8-jsonnet.yml
@@ -1,17 +1,20 @@
-name: build_net6.0 pg12 System.Text.Json
+name: build_net7.0 pg12-plv8 Json.NET
 
 on:
   push:
     branches:
       - master
     paths-ignore:
       - 'documentation/**'
+      - 'docs/**'
+      - 'azure-pipelines.yml'
   pull_request:
     branches:
       - master
     paths-ignore:
       - 'documentation/**'
       - 'docs/**'
+      - 'azure-pipelines.yml'
 
 env:
   config: Release
@@ -29,7 +32,7 @@ jobs:
 
     services:
       postgres:
-        image: oskardudycz/postgres-plv8:12-2
+        image: ionx/postgres-plv8:12.8
         ports:
           - 5432:5432
         env:
@@ -43,7 +46,7 @@ jobs:
           --health-retries 5
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install .NET 6.0.x
         uses: actions/setup-dotnet@v3
@@ -55,6 +58,11 @@ jobs:
         with:
           dotnet-version: 7.0.x
 
+      - name: Install .NET 8.0.x
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: 8.0.x
+
       - name: Install Node.js
         uses: actions/setup-node@v3
         with:
@@ -71,12 +79,21 @@ jobs:
         run: |
           PG_CONTAINER_NAME=$(docker ps --filter expose=5432/tcp --format {{.Names}})
           docker exec $PG_CONTAINER_NAME bash -c "echo -e '\nfsync = off' >> /var/lib/postgresql/data/postgresql.conf"
+          docker exec $PG_CONTAINER_NAME bash -c "echo -e '\nfull_page_writes = off' >> /var/lib/postgresql/data/postgresql.conf"
+          docker exec $PG_CONTAINER_NAME bash -c "echo -e '\nsynchronous_commit = off' >> /var/lib/postgresql/data/postgresql.conf"
           docker container restart $PG_CONTAINER_NAME
         shell: bash
 
       - name: Build
         env:
-          DEFAULT_SERIALIZER: "SystemTextJson"
+          DEFAULT_SERIALIZER: "Newtonsoft"
           marten_testing_database: "Host=localhost;Port=5432;Database=${{ env.pg_db }};Username=${{ env.pg_user }}"
         run: dotnet run --project build/build.csproj -f net7.0 -c Release -- ci
         shell: bash
+
+      - name: Test Extensions
+        env:
+          DEFAULT_SERIALIZER: "Newtonsoft"
+          marten_testing_database: "Host=localhost;Port=5432;Database=${{ env.pg_db }};Username=${{ env.pg_user }}"
+        run: dotnet run --project build/build.csproj -f net7.0 -c Release -- test-extension-libs
+        shell: bash
diff --git a/...ub/workflows/on-push-do-ci-build-pg11.yml → ...-do-ci-build-pg12-plv8-systemtextjson.yml b/...ub/workflows/on-push-do-ci-build-pg11.yml → ...-do-ci-build-pg12-plv8-systemtextjson.yml
@@ -1,17 +1,20 @@
-name: build_net6.0 pg11
+name: build_net6.0 pg12-plv8 System.Text.Json
 
 on:
   push:
     branches:
       - master
     paths-ignore:
       - 'documentation/**'
+      - 'docs/**'
+      - 'azure-pipelines.yml'
   pull_request:
     branches:
       - master
     paths-ignore:
       - 'documentation/**'
       - 'docs/**'
+      - 'azure-pipelines.yml'
 
 env:
   config: Release
@@ -29,7 +32,7 @@ jobs:
 
     services:
       postgres:
-        image: ionx/postgres-plv8:11.5
+        image: ionx/postgres-plv8:12.8
         ports:
           - 5432:5432
         env:
@@ -43,7 +46,8 @@ jobs:
           --health-retries 5
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+
       - name: Install .NET 6.0.x
         uses: actions/setup-dotnet@v3
         with:
@@ -54,6 +58,11 @@ jobs:
         with:
           dotnet-version: 7.0.x
 
+      - name: Install .NET 8.0.x
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: 8.0.x
+
       - name: Install Node.js
         uses: actions/setup-node@v3
         with:
@@ -70,11 +79,21 @@ jobs:
         run: |
           PG_CONTAINER_NAME=$(docker ps --filter expose=5432/tcp --format {{.Names}})
           docker exec $PG_CONTAINER_NAME bash -c "echo -e '\nfsync = off' >> /var/lib/postgresql/data/postgresql.conf"
+          docker exec $PG_CONTAINER_NAME bash -c "echo -e '\nfull_page_writes = off' >> /var/lib/postgresql/data/postgresql.conf"
+          docker exec $PG_CONTAINER_NAME bash -c "echo -e '\nsynchronous_commit = off' >> /var/lib/postgresql/data/postgresql.conf"
           docker container restart $PG_CONTAINER_NAME
         shell: bash
 
       - name: Build
         env:
+          DEFAULT_SERIALIZER: "SystemTextJson"
+          marten_testing_database: "Host=localhost;Port=5432;Database=${{ env.pg_db }};Username=${{ env.pg_user }}"
+        run: dotnet run --project build/build.csproj -f net6.0 -c Release -- ci
+        shell: bash
+
+      - name: Test Extensions
+        env:
+          DEFAULT_SERIALIZER: "SystemTextJson"
           marten_testing_database: "Host=localhost;Port=5432;Database=${{ env.pg_db }};Username=${{ env.pg_user }}"
-        run: dotnet run --project build/build.csproj -f net7.0 -c Release -- ci
+        run: dotnet run --project build/build.csproj -f net6.0 -c Release -- test-extension-libs
         shell: bash