Ship a CLI for Pkg.jl

.github/workflows/release.yml

@@ -40,23 +40,23 @@ jobs:
         include:
           - label: x86_64-pc-windows-msvc-windowsstore
             target: x86_64-pc-windows-msvc
-            bins: --bin juliaup --bin julialauncher
+            bins: --bin juliaup --bin julialauncher --bin juliapkg
             os: windows
-            features: windowsstore,binjulialauncher
+            features: windowsstore,binjulialauncher,juliapkg
             rustflags:
             toolchain: stable
           - label: x86_64-pc-windows-msvc-windowsappinstaller
             target: x86_64-pc-windows-msvc
-            bins: --bin juliaup --bin julialauncher
+            bins: --bin juliaup --bin julialauncher --bin juliapkg
             os: windows
-            features: windowsappinstaller,binjulialauncher
+            features: windowsappinstaller,binjulialauncher,juliapkg
             rustflags:
             toolchain: stable
           - label: x86_64-pc-windows-gnu-msi
             target: x86_64-pc-windows-gnu
-            bins: --bin juliaup --bin julialauncher
+            bins: --bin juliaup --bin julialauncher --bin juliapkg
             os: windows
-            features: binjulialauncher
+            features: binjulialauncher,juliapkg
             rustflags:
             toolchain: stable-gnu
           - label: x86_64-pc-windows-gnu-portable
@@ -68,9 +68,9 @@ jobs:
             toolchain: stable-gnu
           - label: i686-pc-windows-gnu-msi
             target: i686-pc-windows-gnu
-            bins: --bin juliaup --bin julialauncher
+            bins: --bin juliaup --bin julialauncher --bin juliapkg
             os: windows
-            features: binjulialauncher
+            features: binjulialauncher,juliapkg
             rustflags:
             toolchain: stable-i686-gnu
           - label: i686-pc-windows-gnu-portable
@@ -82,9 +82,9 @@ jobs:
             toolchain: stable-i686-gnu
           - label: x86_64-apple-darwin
             target: x86_64-apple-darwin
-            bins: --bin juliaup --bin julialauncher --bin juliainstaller
+            bins: --bin juliaup --bin julialauncher --bin juliainstaller --bin juliapkg
             os: macos
-            features: selfupdate,binjuliainstaller,binjulialauncher
+            features: selfupdate,binjuliainstaller,binjulialauncher,juliapkg
             rustflags:
             toolchain: stable
           - label: x86_64-apple-darwin-portable
@@ -96,16 +96,16 @@ jobs:
             toolchain: stable
           - label: x86_64-unknown-linux-gnu
             target: x86_64-unknown-linux-gnu
-            bins: --bin juliaup --bin julialauncher --bin juliainstaller
+            bins: --bin juliaup --bin julialauncher --bin juliainstaller --bin juliapkg
             os: ubuntu
-            features: selfupdate,binjuliainstaller,binjulialauncher
+            features: selfupdate,binjuliainstaller,binjulialauncher,juliapkg
             rustflags:
             toolchain: stable
           - label: x86_64-unknown-linux-musl
             target: x86_64-unknown-linux-musl
-            bins: --bin juliaup --bin julialauncher --bin juliainstaller
+            bins: --bin juliaup --bin julialauncher --bin juliainstaller --bin juliapkg
             os: ubuntu
-            features: selfupdate,binjuliainstaller,binjulialauncher
+            features: selfupdate,binjuliainstaller,binjulialauncher,juliapkg
             rustflags: -C target-feature=+crt-static
             toolchain: stable
           - label: x86_64-unknown-linux-musl-portable
@@ -117,37 +117,37 @@ jobs:
             toolchain: stable
           - label: x86_64-unknown-freebsd
             target: x86_64-unknown-freebsd
-            bins: --bin juliaup --bin julialauncher --bin juliainstaller
+            bins: --bin juliaup --bin julialauncher --bin juliainstaller --bin juliapkg
             os: ubuntu
-            features: selfupdate,binjuliainstaller,binjulialauncher
+            features: selfupdate,binjuliainstaller,binjulialauncher,juliapkg
             rustflags:
             toolchain: stable
           - label: i686-pc-windows-msvc-windowsstore
             target: i686-pc-windows-msvc
-            bins: --bin juliaup --bin julialauncher
+            bins: --bin juliaup --bin julialauncher --bin juliapkg
             os: windows
-            features: windowsstore,binjulialauncher
+            features: windowsstore,binjulialauncher,juliapkg
             rustflags:
             toolchain: stable
           - label: i686-pc-windows-msvc-windowsappinstaller
             target: i686-pc-windows-msvc
-            bins: --bin juliaup --bin julialauncher
+            bins: --bin juliaup --bin julialauncher --bin juliapkg
             os: windows
-            features: windowsappinstaller,binjulialauncher
+            features: windowsappinstaller,binjulialauncher,juliapkg
             rustflags:
             toolchain: stable
           - label: i686-unknown-linux-gnu
             target: i686-unknown-linux-gnu
-            bins: --bin juliaup --bin julialauncher --bin juliainstaller
+            bins: --bin juliaup --bin julialauncher --bin juliainstaller --bin juliapkg
             os: ubuntu
-            features: selfupdate,binjuliainstaller,binjulialauncher
+            features: selfupdate,binjuliainstaller,binjulialauncher,juliapkg
             rustflags:
             toolchain: stable
           - label: i686-unknown-linux-musl
             target: i686-unknown-linux-musl
-            bins: --bin juliaup --bin julialauncher --bin juliainstaller
+            bins: --bin juliaup --bin julialauncher --bin juliainstaller --bin juliapkg
             os: ubuntu
-            features: selfupdate,binjuliainstaller,binjulialauncher
+            features: selfupdate,binjuliainstaller,binjulialauncher,juliapkg
             rustflags: -C target-feature=+crt-static
             toolchain: stable
           - label: i686-unknown-linux-musl-portable
@@ -159,16 +159,16 @@ jobs:
             toolchain: stable
           - label: aarch64-unknown-linux-gnu
             target: aarch64-unknown-linux-gnu
-            bins: --bin juliaup --bin julialauncher --bin juliainstaller
+            bins: --bin juliaup --bin julialauncher --bin juliainstaller --bin juliapkg
             os: ubuntu
-            features: selfupdate,binjuliainstaller,binjulialauncher
+            features: selfupdate,binjuliainstaller,binjulialauncher,juliapkg
             rustflags:
             toolchain: stable
           - label: aarch64-unknown-linux-musl
             target: aarch64-unknown-linux-musl
-            bins: --bin juliaup --bin julialauncher --bin juliainstaller
+            bins: --bin juliaup --bin julialauncher --bin juliainstaller --bin juliapkg
             os: ubuntu
-            features: selfupdate,binjuliainstaller,binjulialauncher
+            features: selfupdate,binjuliainstaller,binjulialauncher,juliapkg
             rustflags: -C target-feature=+crt-static
             toolchain: stable
           - label: aarch64-unknown-linux-musl-portable
@@ -180,9 +180,9 @@ jobs:
             toolchain: stable
           - label: aarch64-apple-darwin
             target: aarch64-apple-darwin
-            bins: --bin juliaup --bin julialauncher --bin juliainstaller
+            bins: --bin juliaup --bin julialauncher --bin juliainstaller --bin juliapkg
             os: macos
-            features: selfupdate,binjuliainstaller,binjulialauncher
+            features: selfupdate,binjuliainstaller,binjulialauncher,juliapkg
             rustflags:
             toolchain: stable
           - label: aarch64-apple-darwin-portable

.github/workflows/test.yml

@@ -39,77 +39,77 @@ jobs:
           - label: x86_64-pc-windows-msvc-windowsstore
             target: x86_64-pc-windows-msvc
             os: windows
-            features: windowsstore,binjuliainstaller,binjulialauncher
+            features: windowsstore,binjuliainstaller,binjulialauncher,juliapkg
             rustflags:
           - label: x86_64-pc-windows-msvc-windowsappinstaller
             target: x86_64-pc-windows-msvc
             os: windows
-            features: windowsappinstaller,binjuliainstaller,binjulialauncher
+            features: windowsappinstaller,binjuliainstaller,binjulialauncher,juliapkg
             rustflags:
           - label: x86_64-pc-windows-gnu-msi
             target: x86_64-pc-windows-gnu
             os: windows
-            features: windowsappinstaller,binjuliainstaller,binjulialauncher
+            features: windowsappinstaller,binjuliainstaller,binjulialauncher,juliapkg
             rustflags:
           - label: i686-pc-windows-gnu-msi
             target: i686-pc-windows-gnu
             os: windows
-            features: windowsappinstaller,binjuliainstaller,binjulialauncher
+            features: windowsappinstaller,binjuliainstaller,binjulialauncher,juliapkg
             rustflags:
           - label: x86_64-apple-darwin
             target: x86_64-apple-darwin
             os: macos
-            features: selfupdate,binjuliainstaller,binjulialauncher
+            features: selfupdate,binjuliainstaller,binjulialauncher,juliapkg
             rustflags:
           - label: x86_64-unknown-linux-gnu
             target: x86_64-unknown-linux-gnu
             os: ubuntu
-            features: selfupdate,binjuliainstaller,binjulialauncher
+            features: selfupdate,binjuliainstaller,binjulialauncher,juliapkg
             rustflags:
           - label: x86_64-unknown-linux-musl
             target: x86_64-unknown-linux-musl
             os: ubuntu
-            features: selfupdate,binjuliainstaller,binjulialauncher
+            features: selfupdate,binjuliainstaller,binjulialauncher,juliapkg
             rustflags: -C target-feature=+crt-static
           - label: x86_64-unknown-freebsd
             target: x86_64-unknown-freebsd
             os: ubuntu
-            features: selfupdate,binjuliainstaller,binjulialauncher
+            features: selfupdate,binjuliainstaller,binjulialauncher,juliapkg
             rustflags:
           - label: i686-pc-windows-msvc-windowsstore
             target: i686-pc-windows-msvc
             os: windows
-            features: windowsstore,binjuliainstaller,binjulialauncher
+            features: windowsstore,binjuliainstaller,binjulialauncher,juliapkg
             rustflags:
           - label: i686-pc-windows-msvc-windowsappinstaller
             target: i686-pc-windows-msvc
             os: windows
-            features: windowsappinstaller,binjuliainstaller,binjulialauncher
+            features: windowsappinstaller,binjuliainstaller,binjulialauncher,juliapkg
             rustflags:
           - label: i686-unknown-linux-gnu
             target: i686-unknown-linux-gnu
             os: ubuntu
-            features: selfupdate,binjuliainstaller,binjulialauncher
+            features: selfupdate,binjuliainstaller,binjulialauncher,juliapkg
             rustflags:
           - label: i686-unknown-linux-musl
             target: i686-unknown-linux-musl
             os: ubuntu
-            features: selfupdate,binjuliainstaller,binjulialauncher
+            features: selfupdate,binjuliainstaller,binjulialauncher,juliapkg
             rustflags: -C target-feature=+crt-static
           - label: aarch64-unknown-linux-gnu
             target: aarch64-unknown-linux-gnu
             os: ubuntu
-            features: selfupdate,binjuliainstaller,binjulialauncher
+            features: selfupdate,binjuliainstaller,binjulialauncher,juliapkg
             rustflags:
           - label: aarch64-unknown-linux-musl
             target: aarch64-unknown-linux-musl
             os: ubuntu
-            features: selfupdate,binjuliainstaller,binjulialauncher
+            features: selfupdate,binjuliainstaller,binjulialauncher,juliapkg
             rustflags: -C target-feature=+crt-static
           - label: aarch64-apple-darwin
             target: aarch64-apple-darwin
             os: macos
-            features: selfupdate,binjuliainstaller,binjulialauncher
+            features: selfupdate,binjuliainstaller,binjulialauncher,juliapkg
             rustflags:
     steps:
     - uses: actions/checkout@v4
@@ -201,7 +201,7 @@ jobs:
         target: ${{matrix.target}}
     - name: Test
       if: ${{ ! contains(matrix.target, 'freebsd') }}
-      run: cargo test --target ${{matrix.target}} --features ${{matrix.features}}
+      run: cargo test --target ${{matrix.target}} --features ${{matrix.features}} --lib
       env:
         CARGO_TARGET_x86_64-unknown-linux-musl: ${{matrix.rustflags}}
         CARGO_TARGET_i686-unknown-linux-musl: ${{matrix.rustflags}}
@@ -220,4 +220,33 @@ jobs:
         run: |
           . "${HOME}/.cargo/env"
           export RUST_BACKTRACE=full
-          cargo test --target ${{matrix.target}} --features ${{matrix.features}}
+          cargo test --target ${{matrix.target}} --features ${{matrix.features}} --lib
+
+  test-juliapkg:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        julia-channel: [release, lts]
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions-rust-lang/setup-rust-toolchain@v1
+      with:
+        toolchain: stable
+    - name: Build juliaup with juliapkg
+      run: cargo build --release --features dummy,binjulialauncher,juliapkg
+    - name: Install Julia ${{ matrix.julia-channel }} via juliaup
+      run: |
+        ./target/release/juliaup add ${{ matrix.julia-channel }}
+        ./target/release/juliaup default ${{ matrix.julia-channel }}
+      shell: bash
+    - name: Run juliapkg tests with Julia ${{ matrix.julia-channel }}
+      run: cargo test --release --features dummy,binjulialauncher,juliapkg --test juliapkg_tests -- --nocapture
+      env:
+        RUST_BACKTRACE: 1
+    - name: Run juliapkg parity tests with Julia ${{ matrix.julia-channel }} (Linux only)
+      if: runner.os == 'Linux'
+      run: cargo test --release --features dummy,binjulialauncher,juliapkg --test juliapkg_parity_test -- --nocapture
+      env:
+        RUST_BACKTRACE: 1

Cargo.toml

@@ -99,6 +99,7 @@ dummy = []
 binjuliainstaller = []
 binjulialauncher = []
 winpkgidentityext = []
+juliapkg = []
 
 [package.metadata.msix]
 winstoremsix = { file = "deploy/msix/PackagingLayout.xml", variables = [
@@ -134,3 +135,8 @@ path = "src/bin/juliaup.rs"
 name = "juliainstaller"
 path = "src/bin/juliainstaller.rs"
 required-features = ["binjuliainstaller"]
+
+[[bin]]
+name = "juliapkg"
+path = "src/bin/juliapkg.rs"
+required-features = ["juliapkg"]