Add DeclareEntrypoint

.github/workflows/main.yml

@@ -3,82 +3,93 @@ name: Main
 on:
   push:
     branches:
-      - 'main'
+      - main
+      - solana-zig-fork-0.16
   pull_request:
     branches:
-      - 'main'
+      - main
+      - solana-zig-fork-0.16
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 env:
-  SOLANA_ZIG_VERSION: v1.52.0
-  SOLANA_ZIG_DIR: solana-zig
+  SOLANA_ZIG_VERSION: solana-v1.53.0
 
 jobs:
   library:
     name: Build and test library
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-latest, macos-latest]
       fail-fast: false
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v4
-      with:
-        submodules: recursive
-
-    - uses: actions/cache@v4
-      with:
-        path: $SOLANA_ZIG_DIR
-        key: solana-zig-$SOLANA_ZIG_VERSION
-
-    - name: Download solana-zig compiler
-      shell: bash
-      run: ./install-solana-zig.sh $SOLANA_ZIG_DIR
-
-    - name: Test library
-      shell: bash
-      run: |
-        $SOLANA_ZIG_DIR/zig build test --summary all
+      - uses: actions/checkout@v4
+      - name: Setup Zig
+        uses: mlugg/setup-zig@v2
+        with:
+          version: 0.16.0
+      - name: zig version
+        shell: bash
+        run: zig version
+      - name: Test library
+        shell: bash
+        run: |
+          set -o pipefail
+          # Fresh build — see `programs` job for the rationale.
+          rm -rf .zig-cache zig-out
+          zig build test --summary all -freference-trace 2>&1 | tee test-output.txt
+      - name: Upload test output
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: test-output-${{ matrix.os }}
+          path: test-output.txt
 
   programs:
     name: Build and test programs
-    strategy:
-      matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
-      fail-fast: false
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-      with:
-        submodules: recursive
-
-    - uses: actions/cache@v4
-      with:
-        path: |
-          ~/.cargo/registry
-          ~/.cargo/git
-          $SOLANA_ZIG_DIR
-        key: solana-zig-${{ hashFiles('./program-test/Cargo.lock') }}-$SOLANA_ZIG_VERSION
-
-    - name: Download solana-zig compiler
-      shell: bash
-      run: ./install-solana-zig.sh $SOLANA_ZIG_DIR
-
-    - name: Install Rust
-      uses: dtolnay/rust-toolchain@master
-      with:
-        toolchain: 1.86.0
-
-    # took the workaround from https://github.com/sfackler/rust-openssl/issues/2149
-    - name: Set Perl environment variables
-      if: runner.os == 'Windows'
-      run: |
-        echo "PERL=$((where.exe perl)[0])" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
-        echo "OPENSSL_SRC_PERL=$((where.exe perl)[0])" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
-
-    - name: Install build deps
-      shell: bash
-      run: ./program-test/install-build-deps.sh
+      - uses: actions/checkout@v4
+      - name: Download solana-zig fork
+        shell: bash
+        run: |
+          curl -LO "https://github.com/joncinque/solana-zig-bootstrap/releases/download/${SOLANA_ZIG_VERSION}/zig-x86_64-linux-musl.tar.bz2"
+          tar -xjf zig-x86_64-linux-musl.tar.bz2
+          echo "SOLANA_ZIG=$(pwd)/zig-x86_64-linux-musl-baseline/zig" >> "$GITHUB_ENV"
+      - name: Test solana-zig version
+        shell: bash
+        run: |
+          "$SOLANA_ZIG" version
+          "$SOLANA_ZIG" targets | grep -i sbf
 
-    - name: Build and test program
-      shell: bash
-      run: ./program-test/test.sh
+      - name: Test library with solana-zig
+        shell: bash
+        run: |
+          # Always build from a clean slate so the CI catches any
+          # `.bss` / `.data` regression on the BPF target (the SBPFv2
+          # loader rejects programs with writable globals; a stale
+          # `.zig-cache` once masked an `ErrorCode` regression).
+          rm -rf .zig-cache zig-out
+          "$SOLANA_ZIG" build test --summary all
+      - uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            program-test/target
+          key: cargo-${{ runner.os }}-${{ hashFiles('./program-test/Cargo.lock') }}
+          restore-keys: |
+            cargo-${{ runner.os }}-
+      - name: Install Rust
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: 1.86.0
+      - name: Install build deps
+        shell: bash
+        run: ./program-test/install-build-deps.sh
+      - name: Build and test programs
+        shell: bash
+        run: ./program-test/test.sh "$SOLANA_ZIG"

.gitignore

@@ -2,7 +2,10 @@
 .direnv/
 .envrc
 
-solana-zig/
 zig-cache/
 zig-out/
+zig-pkg/
 .zig-cache/
+.tools/
+
+.pi