diff --git a/.github/check_for_tabs.json b/.github/check_for_tabs.json new file mode 100644 index 0000000..c29a758 --- /dev/null +++ b/.github/check_for_tabs.json @@ -0,0 +1,15 @@ +{ + "problemMatcher": [ + { + "owner": "check_for_tabs", + "pattern": [ + { + "regexp": "^([^:]+):(\\d+):(.*)$", + "file": 1, + "line": 2, + "message": 3 + } + ] + } + ] +} diff --git a/.github/workflows/docsgen.yml b/.github/workflows/docsgen.yml deleted file mode 100644 index 220a1da..0000000 --- a/.github/workflows/docsgen.yml +++ /dev/null @@ -1,60 +0,0 @@ -name: Docs -on: - pull_request: - branches: [master] - types: [closed] - -jobs: - GenerateDocs: - if: github.event.pull_request.merged == true - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Checkout Wiki - uses: actions/checkout@v2 - with: - repository: revarbat/BOSL2.wiki - path: BOSL2.wiki - - - name: Apt Update - run: sudo apt update - - - name: Install Packages - run: sudo apt-get install -y python3-pip python3-dev python3-setuptools python3-pil gifsicle - - - name: Install openscad-docsgen - run: sudo pip3 install openscad_docsgen - - - name: Install OpenSCAD - run: | - cd $GITHUB_WORKSPACE - wget https://files.openscad.org/OpenSCAD-2021.01-x86_64.AppImage - sudo mv OpenSCAD-2021.01*-x86_64.AppImage /usr/local/bin/openscad - sudo chmod +x /usr/local/bin/openscad - echo "::add-matcher::.github/openscad_docsgen.json" - - - name: Generating Docs Headless - run: | - export OPENSCADPATH=$(dirname $GITHUB_WORKSPACE) - xvfb-run --server-args="-screen 0, 1280x720x24" -a \ - openscad-docsgen -ticmI *.scad - - - name: Commit Wiki Docs - run: | - cd $GITHUB_WORKSPACE/BOSL2.wiki - git config user.name github-actions - git config user.email github-actions@github.com - git add --all - git commit -m "Wiki docs auto-regen." && git push || true - - - name: Bump Release Version - run: | - cd $GITHUB_WORKSPACE - ./scripts/increment_version.sh - git config user.name github-actions - git config user.email github-actions@github.com - git add version.scad - git commit -m "Bump release version." && git push || true - diff --git a/.github/workflows/forced_docsgen.yml b/.github/workflows/forced_docsgen.yml deleted file mode 100644 index 6393b90..0000000 --- a/.github/workflows/forced_docsgen.yml +++ /dev/null @@ -1,49 +0,0 @@ -name: FDocs -on: - workflow_dispatch: - branches: [master] - -jobs: - GenerateDocs: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Checkout Wiki - uses: actions/checkout@v2 - with: - repository: revarbat/BOSL2.wiki - path: BOSL2.wiki - - - name: Apt Update - run: sudo apt update - - - name: Install Packages - run: sudo apt-get install -y python3-pip python3-dev python3-setuptools python3-pil gifsicle - - - name: Install openscad-docsgen - run: sudo pip3 install openscad_docsgen - - - name: Install OpenSCAD - run: | - cd $GITHUB_WORKSPACE - wget https://files.openscad.org/OpenSCAD-2021.01-x86_64.AppImage - sudo mv OpenSCAD-2021.01*-x86_64.AppImage /usr/local/bin/openscad - sudo chmod +x /usr/local/bin/openscad - echo "::add-matcher::.github/openscad_docsgen.json" - - - name: Generating Docs Headless - run: | - export OPENSCADPATH=$(dirname $GITHUB_WORKSPACE) - xvfb-run --server-args="-screen 0, 1280x720x24" -a \ - openscad-docsgen -ticmIf *.scad - - - name: Commit Wiki Docs - run: | - cd $GITHUB_WORKSPACE/BOSL2.wiki - git config user.name github-actions - git config user.email github-actions@github.com - git add --all - git commit -m "Wiki docs auto-regen." && git push || true - diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ebaa845..6283509 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,4 +1,4 @@ -name: CI +name: Checks on: [pull_request] jobs: @@ -49,6 +49,12 @@ jobs: sudo mv OpenSCAD-2021.01*-x86_64.AppImage /usr/local/bin/openscad sudo chmod +x /usr/local/bin/openscad + - name: Tabs Check + run: | + cd $GITHUB_WORKSPACE + echo "::add-matcher::.github/check_for_tabs.json" + ./scripts/check_for_tabs.sh + - name: Checking Docs run: | cd $GITHUB_WORKSPACE diff --git a/.github/workflows/testwf.yml b/.github/workflows/testwf.yml deleted file mode 100644 index f99e8f6..0000000 --- a/.github/workflows/testwf.yml +++ /dev/null @@ -1,49 +0,0 @@ -name: TestWorkflow -on: - workflow_dispatch: - branches: [master] - -jobs: - TestJob: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Checkout Wiki - uses: actions/checkout@v2 - with: - repository: revarbat/BOSL2.wiki - path: BOSL2.wiki - - - name: Setup OpenGL - uses: openrndr/setup-opengl@v1.1 - - - name: Apt Update - run: sudo apt update - - - name: Install Packages - run: sudo apt-get install -y python3-pip python3-dev python3-setuptools python3-pil gifsicle - - - name: Install openscad-docsgen - run: sudo pip3 install openscad_docsgen - - - name: Install OpenSCAD - run: | - cd $GITHUB_WORKSPACE - wget https://files.openscad.org/OpenSCAD-2021.01-x86_64.AppImage - sudo mv OpenSCAD-2021.01*-x86_64.AppImage /usr/local/bin/openscad - sudo chmod +x /usr/local/bin/openscad - echo "::add-matcher::.github/openscad_docsgen.json" - - - name: Make SCAD File - run: | - cd $GITHUB_WORKSPACE - echo "cube(50, center=100);" > testwf.scad - - - name: TestScript - run: | - export OPENSCADPATH=$(dirname $GITHUB_WORKSPACE) - xvfb-run --server-args="-screen 0, 1280x720x24" -a \ - glxinfo - diff --git a/scripts/check_for_tabs.sh b/scripts/check_for_tabs.sh new file mode 100755 index 0000000..a075703 --- /dev/null +++ b/scripts/check_for_tabs.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +if grep -H -n -P '\t' *.scad ; then + echo "Tabs found in source code." 2>&1 + exit 1 +fi +exit 0 + +