Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: JasperFx/marten
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3.13.5
Choose a base ref
...
head repository: JasperFx/marten
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3.13
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Sep 25, 2021

  1. Copy the full SHA
    928bf53 View commit details

Commits on Oct 9, 2021

  1. Copy the full SHA
    0e0ff1c View commit details

Commits on Jan 23, 2022

  1. Fix tiny typo

    SeanKilleen authored and oskardudycz committed Jan 23, 2022
    Copy the full SHA
    bbe3cfa View commit details
Showing with 35 additions and 3 deletions.
  1. +32 −0 .github/workflows/on-manual-do-nuget-publish.yml
  2. +2 −2 documentation/documentation/admin/installing-plv8-windows.md
  3. +1 −1 martenbuild.cs
32 changes: 32 additions & 0 deletions .github/workflows/on-manual-do-nuget-publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Marten NuGet Manual Publish

on: [workflow_dispatch]

env:
config: Release
DOTNET_CLI_TELEMETRY_OPTOUT: 1
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
dotnet_core_version: 3.1.x

jobs:
publish_job:
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v2

- name: Install .NET Core 3.1
uses: actions/setup-dotnet@v1
with:
dotnet-version: ${{ env.dotnet_core_version }}

- name: Run Pack
run: ./build.sh --no-color pack
shell: bash

- name: Publish to NuGet
run: |
find . -name '*.nupkg' -exec dotnet nuget push "{}" -s https://api.nuget.org/v3/index.json -k ${{ secrets.NUGET_DEPLOY_KEY }} --skip-duplicate \;
# find . -name '*.snupkg' -exec dotnet nuget push "{}" -s https://api.nuget.org/v3/index.json -k ${{ secrets.NUGET_DEPLOY_KEY }} \;
shell: bash
4 changes: 2 additions & 2 deletions documentation/documentation/admin/installing-plv8-windows.md
Original file line number Diff line number Diff line change
@@ -89,7 +89,7 @@ To test out the extension you can create a super basic function which manipulate
```sql
create or replace function test_js_func(value text) returns text as $$

var thing = 'I\' a JavaScript string';
var thing = 'I\'m a JavaScript string';

var result = thing.replace(/JavaScript/g, value);

@@ -106,4 +106,4 @@ select test_js_func('Manipulated');

And we should get a result that reads:

> I' a Manipulated string
> I'm a Manipulated string
2 changes: 1 addition & 1 deletion martenbuild.cs
Original file line number Diff line number Diff line change
@@ -137,7 +137,7 @@ private static void PublishDocs(string branchName, bool exportWithGithubProjectP
// Run("git", "config user.name user_name", docTargetDir);

if (exportWithGithubProjectPrefix)
Run("dotnet", $"stdocs export {docTargetDir} ProjectWebsite -d documentation -c src -v {BUILD_VERSION} --project marten");
Run("dotnet", $"stdocs export {docTargetDir} ProjectWebsite -d documentation -c src -v {BUILD_VERSION} --project v3");
else
Run("dotnet", $"stdocs export {docTargetDir} Website -d documentation -c src -v {BUILD_VERSION}");