Bump Zig to 0.14, Rust to 1.86, Solana to 2.3 (#1)

* Bump Zig to 0.14, Rust to 1.86, Solana to 2.3

* Don't run unit tests under Solana

* Update windows job

* Fixup windows build

* Try something slightly different

* Change how PERL is set

Author: joncinque

.github/workflows/main.yml

@@ -1,14 +1,20 @@
-name: Build and test hello-world program
+name: Main
 
-on: [pull_request, push]
+on:
+  pull_request:
+    branches:
+      - 'main'
+  push:
+    branches:
+      - 'main'
 
 env:
-  SOLANA_ZIG_VERSION: v1.43.0
+  SOLANA_ZIG_VERSION: v1.47.0
   SOLANA_ZIG_DIR: solana-zig
 
 jobs:
   unit-test:
-    name: Run helloworld unit tests
+    name: Unit tests
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
@@ -35,7 +41,7 @@ jobs:
         $SOLANA_ZIG_DIR/zig build test --summary all --verbose
 
   integration-test:
-    name: Run helloworld integration tests
+    name: Integration tests
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
@@ -62,7 +68,35 @@ jobs:
     - name: Install Rust
       uses: dtolnay/rust-toolchain@master
       with:
-        toolchain: 1.78.0
+        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: Setup openssl on Windows
+      if: runner.os == 'Windows'
+      shell: bash
+      run: |
+        cat > vcpkg.json <<EOL
+        {
+          "dependencies": ["openssl"],
+          "overrides": [
+            {
+              "name": "openssl",
+              "version": "3.4.1"
+            }
+          ],
+          "builtin-baseline": "5ee5eee0d3e9c6098b24d263e9099edcdcef6631"
+        }
+        EOL
+        vcpkg install --triplet x64-windows-static-md
+        rm vcpkg.json
+        echo "OPENSSL_LIB_DIR=$PWD/vcpkg_installed/x64-windows-static-md/lib" >> $GITHUB_ENV
+        echo "OPENSSL_INCLUDE_DIR=$PWD/vcpkg_installed/x64-windows-static-md/include" >> $GITHUB_ENV
 
     - name: Install build deps
       shell: bash
@@ -73,7 +107,7 @@ jobs:
       run: ./program-test/test.sh
 
   cli-test:
-    name: Run helloworld CLI tests
+    name: CLI tests
     if: false
     strategy:
       matrix:
@@ -101,7 +135,7 @@ jobs:
     - name: Install Rust
       uses: dtolnay/rust-toolchain@master
       with:
-        toolchain: 1.78.0
+        toolchain: 1.86.0
 
     - name: Install Rust build deps
       shell: bash

build.zig

@@ -1,5 +1,5 @@
 const std = @import("std");
-const solana = @import("solana-program-sdk");
+const solana = @import("solana_program_sdk");
 const base58 = @import("base58");
 
 pub fn build(b: *std.Build) !void {
@@ -28,7 +28,7 @@ pub fn build(b: *std.Build) !void {
     const lib_unit_tests = b.addTest(.{
         .root_source_file = b.path("src/main.zig"),
     });
-    lib_unit_tests.root_module.addImport("solana-program-sdk", solana_mod);
+    lib_unit_tests.root_module.addImport("solana_program_sdk", solana_mod);
     const run_unit_tests = b.addRunArtifact(lib_unit_tests);
     test_step.dependOn(&run_unit_tests.step);
 }

build.zig.zon

@@ -1,13 +1,14 @@
 .{
-    .name = "solana-helloworld-zig",
+    .fingerprint = 0x1ed04a41859b7c7d,
+    .name = .solana_helloworld_zig,
     // This is a [Semantic Version](https://semver.org/).
     // In a future version of Zig it will be used for package deduplication.
-    .version = "0.13.0",
+    .version = "0.14.0",
 
     // This field is optional.
     // This is currently advisory only; Zig does not yet do anything
     // with this value.
-    .minimum_zig_version = "0.12.0",
+    .minimum_zig_version = "0.14.0",
 
     // This field is optional.
     // Each dependency must either provide a `url` and `hash`, or a `path`.
@@ -16,16 +17,12 @@
     // internet connectivity.
     .dependencies = .{
         .base58 = .{
-            .url = "https://github.com/joncinque/base58-zig/archive/refs/tags/v0.13.3.tar.gz",
-            .hash = "1220fd067bf167b9062cc29ccf715ff97643c2d3f8958beea863b6036876bb71bcb8",
+            .url = "https://github.com/joncinque/base58-zig/archive/refs/tags/v0.14.0.tar.gz",
+            .hash = "base58-0.14.0-6-CZm81qAAD4JCRHgewcNh8FS0pmnk7-OmwUkosaFKvg",
         },
-        .clap = .{
-            .url = "https://github.com/Hejsil/zig-clap/archive/refs/tags/0.9.1.tar.gz",
-            .hash = "122062d301a203d003547b414237229b09a7980095061697349f8bef41be9c30266b",
-        },
-        .@"solana-program-sdk" = .{
-            .url = "https://github.com/joncinque/solana-program-sdk-zig/archive/refs/tags/v0.14.0.tar.gz",
-            .hash = "1220bdfa4ea1ab6330959ce4bc40feb5b39a7f98923a266a94b69e27fd20c3526786",
+        .solana_program_sdk = .{
+            .url = "https://github.com/joncinque/solana-program-sdk-zig/archive/refs/tags/v0.16.2.tar.gz",
+            .hash = "solana_program_sdk-0.16.2-wGj9UHXjAAAK5z6ZdLUJ5uu2SxgE8o7ZJ9Il4EG22IJP",
         },
     },