From 646b179b60a8deaf240f894596cbf9e9dae8bc34 Mon Sep 17 00:00:00 2001 From: Garth Minette Date: Fri, 14 May 2021 20:35:10 -0700 Subject: [PATCH 1/5] Reverted error pattern checker. --- .github/openscad_docsgen.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/openscad_docsgen.json b/.github/openscad_docsgen.json index 8dccb43..22450c8 100644 --- a/.github/openscad_docsgen.json +++ b/.github/openscad_docsgen.json @@ -4,11 +4,11 @@ "owner": "docsgen", "pattern": [ { - "regexp": "^!! ((WARNING|ERROR) at ([^:]+):(\\d+): .*[^:])$", - "message": 1, - "severity": 2, - "file": 3, - "line": 4 + "regexp": "^!! (WARNING|ERROR) at ([^:]+):(\\d+): (.*[^:])$", + "severity": 1, + "file": 2, + "line": 3, + "message": 4 } ] } From 45e68af2d77f2579fdfcf5d1a2f28d355e6686d9 Mon Sep 17 00:00:00 2001 From: Garth Minette Date: Sun, 16 May 2021 12:49:53 -0700 Subject: [PATCH 2/5] Attempt to fix github action errorss. --- .github/workflows/docsgen.yml | 2 +- .github/workflows/main.yml | 14 +++++--------- affine.scad | 1 + 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/workflows/docsgen.yml b/.github/workflows/docsgen.yml index 5a70e96..dbec4e3 100644 --- a/.github/workflows/docsgen.yml +++ b/.github/workflows/docsgen.yml @@ -14,7 +14,7 @@ jobs: - name: Checkout Wiki uses: actions/checkout@v2 with: - repository: ${{github.repository}}.wiki + repository: https://github.com/revarbat/BOSL2.wiki.git path: BOSL2.wiki - name: Install gifsicle diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 69eed65..da02744 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,11 +8,6 @@ jobs: - name: Checkout uses: actions/checkout@v2 - - name: Clone Wiki - run: | - cd $GITHUB_WORKSPACE - git clone https://github.com/revarbat/BOSL2.wiki.git - - name: Install OpenSCAD run: | cd $GITHUB_WORKSPACE @@ -33,9 +28,10 @@ jobs: uses: actions/checkout@v2 - name: Clone Wiki - run: | - cd $GITHUB_WORKSPACE - git clone https://github.com/revarbat/BOSL2.wiki.git + uses: actions/checkout@v2 + with: + repository: https://github.com/revarbat/BOSL2.wiki.git + path: BOSL2.wiki - name: Apt Update run: sudo apt update @@ -53,7 +49,7 @@ jobs: sudo mv OpenSCAD-2021.01*-x86_64.AppImage /usr/local/bin/openscad sudo chmod +x /usr/local/bin/openscad - - name: Generating Docs + - name: Checking Docs run: | cd $GITHUB_WORKSPACE echo "::add-matcher::.github/openscad_docsgen.json" diff --git a/affine.scad b/affine.scad index 55c3ea3..7654973 100644 --- a/affine.scad +++ b/affine.scad @@ -45,6 +45,7 @@ function ident(n) = [ // bool = is_affine(x,); // Topics: Affine, Matrices, Transforms, Type Checking // See Also: is_matrix() +// fleegul() // Description: // Tests if the given value is an affine matrix, possibly also checking it's dimenstion. // Arguments: From 110b9fbda4f4fb3f4525372409210e912c755307 Mon Sep 17 00:00:00 2001 From: Garth Minette Date: Sun, 16 May 2021 12:52:31 -0700 Subject: [PATCH 3/5] Fixed wiki repo url. --- .github/workflows/docsgen.yml | 2 +- .github/workflows/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docsgen.yml b/.github/workflows/docsgen.yml index dbec4e3..9fa44bd 100644 --- a/.github/workflows/docsgen.yml +++ b/.github/workflows/docsgen.yml @@ -14,7 +14,7 @@ jobs: - name: Checkout Wiki uses: actions/checkout@v2 with: - repository: https://github.com/revarbat/BOSL2.wiki.git + repository: revarbat/BOSL2.wiki path: BOSL2.wiki - name: Install gifsicle diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index da02744..ebaa845 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,7 +30,7 @@ jobs: - name: Clone Wiki uses: actions/checkout@v2 with: - repository: https://github.com/revarbat/BOSL2.wiki.git + repository: revarbat/BOSL2.wiki path: BOSL2.wiki - name: Apt Update From df45dbd1595dda9e8ae61d2e471f45aa9634bbc1 Mon Sep 17 00:00:00 2001 From: Garth Minette Date: Sun, 16 May 2021 12:55:30 -0700 Subject: [PATCH 4/5] Try to make error matcher more useful. --- .github/openscad_docsgen.json | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/openscad_docsgen.json b/.github/openscad_docsgen.json index 22450c8..475dc3e 100644 --- a/.github/openscad_docsgen.json +++ b/.github/openscad_docsgen.json @@ -4,11 +4,9 @@ "owner": "docsgen", "pattern": [ { - "regexp": "^!! (WARNING|ERROR) at ([^:]+):(\\d+): (.*[^:])$", + "regexp": "^!! (WARNING|ERROR) at ([^:]+:\\d+: .*[^:])$", "severity": 1, - "file": 2, - "line": 3, - "message": 4 + "message": 2 } ] } From f441298e090e3f37022c830e4acec12b87b19ee8 Mon Sep 17 00:00:00 2001 From: Garth Minette Date: Sun, 16 May 2021 12:57:18 -0700 Subject: [PATCH 5/5] Removed test docs error. --- affine.scad | 1 - 1 file changed, 1 deletion(-) diff --git a/affine.scad b/affine.scad index 7654973..55c3ea3 100644 --- a/affine.scad +++ b/affine.scad @@ -45,7 +45,6 @@ function ident(n) = [ // bool = is_affine(x,); // Topics: Affine, Matrices, Transforms, Type Checking // See Also: is_matrix() -// fleegul() // Description: // Tests if the given value is an affine matrix, possibly also checking it's dimenstion. // Arguments: