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/CODEOWNERS

@@ -0,0 +1,9 @@
+# Default
+* @luau-lang/lute-contrib
+
+# GitHub configuration
+/.github/ @luau-lang/lute-maintainers
+
+# Package management
+/lute/cli/commands/pkg/ @luau-lang/lute-pkg-maintainers
+/tests/cli/pkg/ @luau-lang/lute-pkg-maintainers

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

@@ -16,6 +16,14 @@ 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"
+  install-system-deps:
+    description: "Whether to install system build dependencies via apt-get. Set to 'false' when the caller provisions its own toolchain (e.g. inside a custom container)."
+    required: false
+    default: "true"
 
 outputs:
   exe_path:
@@ -26,24 +34,31 @@ runs:
   using: "composite"
   steps:
     - name: Install tools
+      if: ${{ inputs.use-bootstrap == 'false' }}
       uses: Roblox/setup-foreman@v3
       with:
         token: ${{ inputs.token }}
         allow-external-github-orgs: true
 
     - name: Install dependencies (Linux)
-      if: runner.os == 'Linux'
+      if: runner.os == 'Linux' && inputs.install-system-deps == 'true'
       shell: bash
       run: |
         sudo apt-get update
-        sudo apt-get install -y ninja-build clang
+        sudo apt-get install -y ninja-build clang ccache
 
     - name: Install dependencies (macOS)
       if: runner.os == 'macOS'
       shell: bash
       run: |
         brew update
         brew unlink brotli zstd
+        brew install ccache
+
+    - name: Install dependencies (Windows)
+      if: runner.os == 'Windows'
+      shell: bash
+      run: choco install ccache -y
 
     - name: Set up MSVC
       if: runner.os == 'Windows'
@@ -54,29 +69,76 @@ runs:
       uses: luau-lang/setup-nasm@v1
 
     - name: Cache extern folder
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       id: cache-extern
       with:
         path: extern
         key: extern-${{ hashFiles('extern/*.tune') }}
 
+    - name: Configure ccache
+      shell: bash
+      run: |
+        echo "CCACHE_DIR=${{ github.workspace }}/.ccache" >> $GITHUB_ENV
+        echo "CCACHE_MAXSIZE=500M" >> $GITHUB_ENV
+        echo "CCACHE_COMPRESS=true" >> $GITHUB_ENV
+        echo "CCACHE_COMPRESSLEVEL=6" >> $GITHUB_ENV
+        # zero statistics
+        ccache -z
+
+    - name: Restore ccache
+      uses: actions/cache/restore@v5
+      id: cache-ccache
+      with:
+        path: .ccache
+        key: ccache-${{ runner.os }}-${{ inputs.options }}-
+        lookup-only: false
+
+
+    - name: ccache stats (pre-build)
+      shell: bash
+      run: |
+        echo "Cache status: ${{ steps.cache-ccache.outputs.cache-hit }}"
+        ccache -s
+
+    - name: Bootstrap Lute (if needed) and set LUTE
+      shell: bash
+      run: |
+        if [[ "${{ inputs.use-bootstrap }}" == "true" ]]; then
+          echo "Bootstrapping Lute..."
+          ./tools/bootstrap.sh --with-ccache --build-debug
+          echo "LUTE=./build/lute0" >> $GITHUB_ENV
+        else
+          echo "LUTE=lute" >> $GITHUB_ENV
+        fi
+
     - name: Fetch ${{ inputs.target }}
       if: steps.cache-extern.outputs.cache-hit != 'true'
       shell: bash
-      run: lute ./tools/luthier.luau fetch ${{ inputs.target }}
+      run: $LUTE ./tools/luthier.luau fetch ${{ inputs.target }}
 
     - name: Configure ${{ inputs.target }}
       shell: bash
-      run: lute ./tools/luthier.luau configure ${{ inputs.target }} --config ${{ inputs.config }} ${{ inputs.options }}
+      run: $LUTE ./tools/luthier.luau configure ${{ inputs.target }} --with-ccache --config ${{ inputs.config }} ${{ inputs.options }}
 
     - name: Build ${{ inputs.target }}
       shell: bash
-      run: lute ./tools/luthier.luau build ${{ inputs.target }} --config ${{ inputs.config }} ${{ inputs.options }}
+      run: $LUTE ./tools/luthier.luau build ${{ inputs.target }} --with-ccache --config ${{ inputs.config }} ${{ inputs.options }}
+
+    - name: ccache stats (post-build)
+      shell: bash
+      run: ccache -s
+
+    - name: Save ccache
+      if: github.ref_name == 'primary'
+      uses: actions/cache/save@v5
+      with:
+        path: .ccache
+        key: ccache-${{ runner.os }}-${{ inputs.options }}-${{ github.sha }}
 
     - name: Get Artifact Path
       id: artifact_path
       shell: bash
       run: |
-        exe_path=$(lute ./tools/luthier.luau build ${{ inputs.target }} --config ${{ inputs.config }} --which)
+        exe_path=$($LUTE ./tools/luthier.luau build ${{ inputs.target }} --config ${{ inputs.config }} --which)
         echo "Executable path: $exe_path"  # Debug print
         echo "exe_path=$exe_path" >> "$GITHUB_OUTPUT"

.github/auto_assign.yml

@@ -0,0 +1,2 @@
+# Set to author to set pr creator as assignee
+addAssignees: author