Merge pull request #39 from 3MFConsortium/develop_1.2.0

Fix namespace for beamlattice balls
3MFConsortium · Mar 29, 2021 · 563c864 · 563c864
2 parents 096b012 + 036da05
commit 563c864
Show file tree

Hide file tree

Showing 11 changed files with 203 additions and 109 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -0,0 +1,28 @@
+# It is used to create am easily distributable and printable PDF
+# version of a specification document written in markdown (3MF-style).
+
+# (outdated) Documentation:
+#   https://github.com/3MFConsortium/spec_conventions/blob/master/generatePDFs/generatePDFs.md
+
+on: [pull_request]
+name: Build
+jobs:
+  build-linux:
+    runs-on: ubuntu-20.04
+    env:
+      SPECNAME: "3MF Beam Lattice Extension"
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: true
+      - run: pip install wheel
+      - run: pip install grip
+      - run: ./markdownToPDF/install_wkhtmltopdf.sh
+      - run: ./markdownToPDF/mdToPDF.sh "$SPECNAME"
+      - name: Upload PDF
+        uses: actions/upload-artifact@v2
+        with:
+          name: ${{ env.SPECNAME }}.pdf
+          path: ${{ env.SPECNAME }}.pdf
+
+
diff --git a/.travis.yml b/.travis.yml
diff --git a/3MF Beam Lattice Extension.md b/3MF Beam Lattice Extension.md
diff --git a/images/ball.png b/images/ball.png
diff --git a/images/ballref.png b/images/ballref.png
diff --git a/images/balls.png b/images/balls.png
diff --git a/images/beamlattice.png b/images/beamlattice.png
diff --git a/images/beamset.png b/images/beamset.png
diff --git a/images/figure_2-1.png b/images/figure_2-1.png
diff --git a/images/mesh.png b/images/mesh.png
diff --git a/markdownToPDF/mdToPDF.sh b/markdownToPDF/mdToPDF.sh
@@ -23,13 +23,13 @@
 
 #!/bin/bash
 
-mkdir ~/.grip
-echo "PASSWORD = '${GITHUB_API_KEY}'" > ~/.grip/settings.py
+# mkdir ~/.grip
+# echo "PASSWORD = '${GITHUB_API_KEY}'" > ~/.grip/settings.py
 
 FILE="$1"
 TMPFILE="temp.html"
 
-grip "$FILE.md" --export "$FILE.html"
+/home/runner/.local/bin/grip "$FILE.md" --export "$FILE.html"
 sed "s|readme boxed-group clearfix announce instapaper_body md||g" "$FILE.html" > "$TMPFILE"
 sed -i "s|.md$||g" "$TMPFILE"
 sed -i 's|<a href="images/3mf_logo_50px.png"|<a|g' "$TMPFILE"