sync

.clang-format

@@ -12,7 +12,21 @@ BreakConstructorInitializers: BeforeComma
 BreakInheritanceList: BeforeComma
 ColumnLimit: 150
 IndentCaseLabels: false
-SortIncludes: false
+SortIncludes: CaseInsensitive
+IncludeBlocks: Regroup
+IncludeCategories:
+  - Regex: '^["](commands|generated/).*'
+    Priority: 1
+  - Regex: '^["](lute)/.*'
+    Priority: 2
+  - Regex: '^["](Luau)/.*'
+    Priority: 3
+  - Regex: '^["](lua).*'
+    Priority: 4
+  - Regex: '^["](openssl/|sodium/|uv|curl/|zlib).*'
+    Priority: 5
+  - Regex: '^<[^/]*>'
+    Priority: 6
 IndentWidth: 4
 TabWidth: 4
 ObjCBlockIndentWidth: 4

.gitattributes

@@ -0,0 +1 @@
+*.tune linguist-language=TOML

.github/actions/setup-and-build/action.yml

@@ -16,6 +16,10 @@ inputs:
   token:
     description: "Token for foreman"
     required: true
+  use-bootstrap:
+    description: "Whether to use the bootstrap script to build the Lute used to run luthier"
+    required: false
+    default: "false"
 
 outputs:
   exe_path:
@@ -60,6 +64,14 @@ runs:
         path: extern
         key: extern-${{ hashFiles('extern/*.tune') }}
 
+    - name: Bootstrap Lute
+      if: ${{ inputs.use-bootstrap == 'true' }}
+      shell: bash
+      run: |
+        echo "Bootstrapping Lute..."
+        ./tools/bootstrap.sh
+        alias lute="./build/lute0"
+
     - name: Fetch ${{ inputs.target }}
       if: steps.cache-extern.outputs.cache-hit != 'true'
       shell: bash

.github/workflows/ci.yml

@@ -1,39 +1,61 @@
-name: build
+name: CI
 
 on:
   push:
     branches: ["primary"]
   pull_request:
     branches: ["primary"]
 
+# CI on the "primary" branch opts out of concurrency grouping by using the run's
+# unique run_id.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/primary' && github.run_id || github.ref }}
+  cancel-in-progress: true
+
 jobs:
-  build:
+  run-lutecli-luau-tests:
     runs-on: ${{ matrix.os }}
+    timeout-minutes: 15
 
     strategy:
       matrix:
         include:
           - os: windows-latest
             options: --c-compiler cl.exe --cxx-compiler cl.exe
           - os: ubuntu-latest
-            options: --c-compiler gcc --cxx-compiler g++
+            options: --c-compiler gcc --cxx-compiler g++ --enable-sanitizers
           - os: ubuntu-latest
-            options: --c-compiler clang --cxx-compiler clang++
+            options: --c-compiler clang --cxx-compiler clang++ --enable-sanitizers
           - os: macos-latest
+            options: --enable-sanitizers
+          - os: ubuntu-latest
+            options: --c-compiler gcc --cxx-compiler g++ --enable-sanitizers
+            use-bootstrap: true
+          - os: ubuntu-latest
+            options: --c-compiler clang --cxx-compiler clang++ --enable-sanitizers
+            use-bootstrap: true
       fail-fast: false
 
     steps:
       - uses: actions/checkout@v4
 
       - name: Setup and Build Lute
+        id: build_lute
         uses: ./.github/actions/setup-and-build
         with:
           target: Lute.CLI
           config: debug
           options: ${{ matrix.options }}
           token: ${{ secrets.GITHUB_TOKEN }}
+          use-bootstrap: ${{ matrix.use-bootstrap || 'false' }}
+
+      - name: Use CI .luaurc file
+        run: rm .luaurc && mv .luaurc.ci .luaurc
+
+      - name: Run Luau Tests (POSIX)
+        run: ${{ steps.build_lute.outputs.exe_path }} test
 
-  test:
+  run-lute-cxx-unittests:
     runs-on: ${{ matrix.os }}
 
     strategy:
@@ -42,29 +64,29 @@ jobs:
           - os: windows-latest
             options: --c-compiler cl.exe --cxx-compiler cl.exe
           - os: ubuntu-latest
-            options: --c-compiler gcc --cxx-compiler g++
+            options: --c-compiler gcc --cxx-compiler g++ --enable-sanitizers
           - os: ubuntu-latest
-            options: --c-compiler clang --cxx-compiler clang++
+            options: --c-compiler clang --cxx-compiler clang++ --enable-sanitizers
           - os: macos-latest
+            options: --enable-sanitizers
       fail-fast: false
 
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Setup and Build Tests
+      - name: Setup and Build C++ Unit Tests
         id: build_tests
         uses: ./.github/actions/setup-and-build
         with:
           target: Lute.Test
           config: debug
           options: ${{ matrix.options }}
           token: ${{ secrets.GITHUB_TOKEN }}
-
       - name: Remove .luaurc file
         run: rm .luaurc
 
-      - name: Run Tests
+      - name: Run C++ Tests
         run: ${{ steps.build_tests.outputs.exe_path }}
 
   check-format:
@@ -82,13 +104,67 @@ jobs:
       - name: Run StyLua
         run: stylua --check .
 
+  build-docs-site:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+
+      - name: Install tools
+        uses: Roblox/setup-foreman@v3
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          allow-external-github-orgs: true
+
+      - name: Install dependencies
+        run: npm install
+        working-directory: docs
+
+      - name: Build docs site
+        run: npm run build
+        working-directory: docs
+
+      - name: Upload docs artifact
+        id: deployment
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: docs/.vitepress/dist/
+
+  lute-lint:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup and Build Lute
+        id: build_lute
+        uses: ./.github/actions/setup-and-build
+        with:
+          target: Lute.CLI
+          config: debug
+          options: ${{ matrix.options }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+          use-bootstrap: true
+
+      - name: Run Lute Lint
+        run: ${{ steps.build_lute.outputs.exe_path }} lint -v .
+
   aggregator:
     name: Gated Commits
     runs-on: ubuntu-latest
-    needs:
-      - build
+    needs: [run-lutecli-luau-tests, run-lute-cxx-unittests, check-format, build-docs-site, lute-lint]
     if: ${{ always() }}
     steps:
-      - name: Aggregate
+      - name: Aggregator
         run: |
-          echo "All required jobs completed"
+          if [ "${{ needs.run-lutecli-luau-tests.result }}" == "success" ] && [ "${{ needs.run-lute-cxx-unittests.result }}" == "success" ] && [ "${{ needs.check-format.result }}" == "success" ] && [ "${{ needs.build-docs-site.result }}" == "success" ] && [ "${{ needs.lute-lint.result }}" == "success" ]; then
+            echo "All jobs succeeded"
+          else
+            echo "One or more jobs failed"
+            exit 1
+          fi

.github/workflows/release.yml

@@ -16,6 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       proceed: ${{ steps.check.outputs.proceed }}
+      nightly_tag: ${{ steps.set_nightly.outputs.nightly_tag }}
     permissions:
       contents: read
 
@@ -58,6 +59,13 @@ jobs:
 
           echo "proceed=$PROCEED" >> $GITHUB_OUTPUT
 
+      - name: Set nightly version suffix
+        id: set_nightly
+        if: github.event_name == 'schedule' || github.event.inputs.nightly
+        run: |
+          DATE=$(date +%Y%m%d)
+          echo "nightly_tag=nightly.$DATE" >> "$GITHUB_OUTPUT"
+
   build:
     strategy:
       matrix:
@@ -82,6 +90,10 @@ jobs:
     - name: Checkout code
       uses: actions/checkout@v4
 
+    - name: Set nightly version suffix
+      if: needs.check.outputs.nightly_tag
+      run: echo "LUTE_VERSION_SUFFIX=${{ needs.check.outputs.nightly_tag }}" >> "$GITHUB_ENV"
+
     - name: Setup and Build Lute
       id: build_lute
       uses: ./.github/actions/setup-and-build
@@ -98,7 +110,7 @@ jobs:
         name: ${{ matrix.artifact_name }}
 
   release:
-    needs: build
+    needs: [check, build]
     runs-on: ubuntu-latest
 
     permissions:
@@ -130,11 +142,9 @@ jobs:
 
       - name: Create Nightly Tag
         id: tag_step
-        if: github.event_name == 'schedule' || github.event.inputs.nightly
+        if: needs.check.outputs.nightly_tag
         run: |
-          DATE=$(date +%Y%m%d)
-          TAG="-nightly.$DATE"
-          echo "tag=$TAG" >> $GITHUB_OUTPUT
+          echo "tag=-${{ needs.check.outputs.nightly_tag }}" >> $GITHUB_OUTPUT
 
       - name: Create Release Tag
         id: tag_release
@@ -144,11 +154,20 @@ jobs:
           RELEASE_TAG="$VERSION$NIGHTLY_TAG"
           echo "tag=$RELEASE_TAG" >> $GITHUB_OUTPUT
 
-      - name: Create Release
+      - name: Create Draft Release
         uses: luau-lang/action-gh-release@v2
         with:
           tag_name: ${{ steps.tag_release.outputs.tag }}
           name: ${{ steps.tag_release.outputs.tag }}
-          draft: false
+          draft: true
           prerelease: ${{ github.event.inputs.nightly || github.event_name == 'schedule' }}
+          generate_release_notes: true
           files: release/*.zip
+
+      - name: Wait for Tag Creation in GitHub
+        run: sleep 5
+
+      - name: Publish Release
+        run: gh release edit "${{ steps.tag_release.outputs.tag }}" --draft=false
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}