Merge pull request #158 from phaazon/release/glsl

Prepare glsl-6.0.3.

.github/workflows/ci.yaml

@@ -2,10 +2,10 @@ name: CI
 on: [pull_request]
 
 jobs:
-  build-linux:
+  glsl-linux:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
       - name: Cargo update
         run: cargo update
       - name: Build glsl
@@ -16,106 +16,118 @@ jobs:
         run: |
           cd $GITHUB_WORKSPACE/glsl
           cargo test --verbose
+
+  glsl-tree-linux:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Cargo update
+        run: cargo update
       - name: Build glsl-tree
         run: |
           cd $GITHUB_WORKSPACE/glsl-tree
           cargo build --verbose
+
+  glsl-quasiquote-linux:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
       - name: Switch to nightly Rust
         run: rustup default nightly
-      - name: Build glsl-quasiquote (nightly)
+      - name: Build glsl-quasiquote
         run: |
           cd $GITHUB_WORKSPACE/glsl-quasiquote
           cargo build --verbose
-      - name: Test glsl-quasiquote (nightly)
+      - name: Test glsl-quasiquote
         run: |
           cd $GITHUB_WORKSPACE/glsl-quasiquote
           cargo test --verbose
 
-  build-macos:
+  glsl-macos:
     runs-on: macOS-latest
     steps:
-      - uses: actions/checkout@v1
-      - name: Install Rust
-        run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile=minimal
+      - uses: actions/checkout@v4
       - name: Cargo update
-        run: |
-          source ~/.cargo/env
-          cargo update
+        run: cargo update
       - name: Build glsl
         run: |
-          source ~/.cargo/env
           cd $GITHUB_WORKSPACE/glsl
           cargo build --verbose
       - name: Test glsl
         run: |
-          source ~/.cargo/env
           cd $GITHUB_WORKSPACE/glsl
           cargo test --verbose
+
+  glsl-tree-macos:
+    runs-on: macOS-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Cargo update
+        run: cargo update
       - name: Build glsl-tree
         run: |
-          source ~/.cargo/env
           cd $GITHUB_WORKSPACE/glsl-tree
           cargo build --verbose
+
+  glsl-quasiquote-macos:
+    runs-on: macOS-latest
+    steps:
+      - uses: actions/checkout@v4
       - name: Switch to nightly Rust
+        run: rustup default nightly
+      - name: Build glsl-quasiquote
         run: |
-          source ~/.cargo/env
-          rustup default nightly
-      - name: Build glsl-quasiquote (nightly)
-        run: |
-          source ~/.cargo/env
           cd $GITHUB_WORKSPACE/glsl-quasiquote
           cargo build --verbose
-      - name: Test glsl-quasiquote (nightly)
+      - name: Test glsl-quasiquote
         run: |
-          source ~/.cargo/env
           cd $GITHUB_WORKSPACE/glsl-quasiquote
           cargo test --verbose
 
-  build-windows:
+  glsl-windows:
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
       - name: Cargo update
         run: cargo update
       - name: Build glsl
         run: |
-          cd glsl
+          cd $env:GITHUB_WORKSPACE\glsl
           cargo build --verbose
       - name: Test glsl
         run: |
-          cd glsl
+          cd $env:GITHUB_WORKSPACE\glsl
           cargo test --verbose
+
+  glsl-tree-windows:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Cargo update
+        run: cargo update
       - name: Build glsl-tree
         run: |
-          cd glsl-tree
+          cd $env:GITHUB_WORKSPACE\glsl-tree
           cargo build --verbose
+
+  glsl-quasiquote-windows:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v4
       - name: Switch to nightly Rust
         run: rustup default nightly
-      - name: Build glsl-quasiquote (nightly)
+      - name: Build glsl-quasiquote
         run: |
-          cd glsl-quasiquote
+          cd $env:GITHUB_WORKSPACE\glsl-quasiquote
           cargo build --verbose
-      - name: Test glsl-quasiquote (nightly)
+      - name: Test glsl-quasiquote
         run: |
-          cd glsl-quasiquote
+          cd $env:GITHUB_WORKSPACE\glsl-quasiquote
           cargo test --verbose
 
-  check-readme:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-      - name: Install cargo-sync-readme
-        run: cargo install --force cargo-sync-readme
-      - name: Check
-        run: |
-          cd $GITHUB_WORKSPACE/glsl
-          cargo sync-readme -c
-          cd $GITHUB_WORKSPACE/glsl-quasiquote
-          cargo sync-readme -c
-
   check-fmt:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
       - name: Ensure code is correctly formatted
         run: cargo fmt -- --check

glsl-quasiquote/Cargo.toml

@@ -22,5 +22,5 @@ proc-macro = true
 [dependencies]
 glsl = "6"
 proc-macro2 = "1"
-proc-macro-faithful-display = "0.1"
+proc-macro-faithful-display = "0.2"
 quote = "1"

glsl/CHANGELOG.md

@@ -1,4 +1,12 @@
-# Changelog
+# 6.0.3
+
+> Dec 18, 2023
+
+- Fix missing `do-while` and `for` init expressions semicolons (7abee68).
+- Replace now-standard `#elseif` preprocessor directivy by `#elif` (2791414).
+- Some fixes for the GLSL transpiler:
+  - `low -> lowp`
+  - A missing whitespace between precision qualifiers and the type of the variable.
 
 # 6.0.2
 

glsl/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "glsl"
-version = "6.0.2"
+version = "6.0.3"
 license = "BSD-3-Clause"
 authors = ["Dimitri Sabadie <[email protected]>"]
 description = "A GLSL450/GLSL460 parser."