update versions and readme

Author: evandowning

.github/workflows/publish.yml

@@ -36,14 +36,18 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Generate manifest
         run: |
-          version() { grep '^version:' "$1" | cut -d' ' -f2; }
+          version() { grep -m1 '^version: ' "$1" | cut -d' ' -f2; }
+          cpp_all="$(version cpp/lib/qlpack.yml)"
+          cpp_queries="$(version cpp/src/qlpack.yml)"
+          go_queries="$(version go/src/qlpack.yml)"
+          java_queries="$(version java/src/qlpack.yml)"
           cat > manifest.json <<EOF
           {
             "packs": [
-              {"name": "trailofbits/cpp-all", "version": "$(version cpp/lib/qlpack.yml)", "registry": "ghcr.io"},
-              {"name": "trailofbits/cpp-queries", "version": "$(version cpp/src/qlpack.yml)", "registry": "ghcr.io"},
-              {"name": "trailofbits/go-queries", "version": "$(version go/src/qlpack.yml)", "registry": "ghcr.io"},
-              {"name": "trailofbits/java-queries", "version": "$(version java/src/qlpack.yml)", "registry": "ghcr.io"}
+              {"name": "trailofbits/cpp-all", "version": "$cpp_all", "registry": "ghcr.io"},
+              {"name": "trailofbits/cpp-queries", "version": "$cpp_queries", "registry": "ghcr.io"},
+              {"name": "trailofbits/go-queries", "version": "$go_queries", "registry": "ghcr.io"},
+              {"name": "trailofbits/java-queries", "version": "$java_queries", "registry": "ghcr.io"}
             ]
           }
           EOF

README.md

@@ -57,8 +57,9 @@ make generate-table generate-help
 ## Release
 
 1. Ensure all `qlpack.yml` files have the correct version.
+
    ```shell
    ./scripts/update-version.sh <version>
    ```
-1. Create a release on GitHub, create a new tag, and autogenerate release notes.
 
+1. Create a release on GitHub, create a new tag, and autogenerate release notes.

go/src/qlpack.yml

@@ -2,7 +2,7 @@
 name: trailofbits/go-queries
 description: CodeQL queries for Go developed by Trail of Bits
 authors: Trail of Bits
-version: 0.2.1
+version: 0.3.0
 license: AGPL
 library: false
 extractor: go

java/src/qlpack.yml

@@ -2,7 +2,7 @@
 name: trailofbits/java-queries
 description: CodeQL queries for Java developed by Trail of Bits
 authors: Trail of Bits
-version: 0.0.1
+version: 0.3.0
 license: AGPL
 library: false
 extractor: java-kotlin

scripts/update-version.sh

@@ -21,6 +21,17 @@ packs=(
 	java/src/qlpack.yml
 )
 
+for f in "${packs[@]}"; do
+	if [[ ! -f "$f" ]]; then
+		echo "Error: file not found: $f (run from repo root)" >&2
+		exit 1
+	fi
+	if ! grep -q '^version: ' "$f"; then
+		echo "Error: no 'version:' line in $f" >&2
+		exit 1
+	fi
+done
+
 for f in "${packs[@]}"; do
 	tmp="$(mktemp)"
 	sed "s/^version: .*/version: $version/" "$f" >"$tmp"