From 5607b3c4a2cfcded0d1983b462639f22d36bb60b Mon Sep 17 00:00:00 2001
From: Oz <oz@certora.com>
Date: Mon, 4 Nov 2024 21:06:38 +0200
Subject: [PATCH 01/48] first build test

---
 .github/workflows/main.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 .github/workflows/main.yml

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 0000000..94f5dfb
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,16 @@
+name: Build Tools
+
+on:
+  push:
+    branches:
+      - oz/ci
+
+jobs:
+  build-mac:
+    runs-on: macos-latest
+    env:
+      TAG: ${{ github.ref_name }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Build
+        run: just package
\ No newline at end of file

From 432ae47541ce155f19a5716dde7b7c1a54e4c42c Mon Sep 17 00:00:00 2001
From: Oz <oz@certora.com>
Date: Mon, 4 Nov 2024 21:10:13 +0200
Subject: [PATCH 02/48] install just

---
 .github/workflows/main.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 94f5dfb..91f1e35 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -12,5 +12,9 @@ jobs:
       TAG: ${{ github.ref_name }}
     steps:
       - uses: actions/checkout@v4
+      - name: Install dependencies
+        uses: extractions/setup-just@v1
+        with:
+          just-version: 1.5.0 
       - name: Build
         run: just package
\ No newline at end of file

From 7bb40c1e3d40fcea738d032ea9c240e46c0dbc57 Mon Sep 17 00:00:00 2001
From: Oz <oz@certora.com>
Date: Mon, 4 Nov 2024 21:20:50 +0200
Subject: [PATCH 03/48] try using brew

---
 .github/workflows/main.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 91f1e35..8fb3c6d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -12,9 +12,11 @@ jobs:
       TAG: ${{ github.ref_name }}
     steps:
       - uses: actions/checkout@v4
-      - name: Install dependencies
-        uses: extractions/setup-just@v1
-        with:
-          just-version: 1.5.0 
+      - name: Install just
+        run: brew install just
+      # - name: Install dependencies
+      #   uses: extractions/setup-just@v1
+      #   with:
+      #     just-version: 1.5.0 
       - name: Build
         run: just package
\ No newline at end of file

From ebc034a2d977d022de43bafbdb693ff9dbc34341 Mon Sep 17 00:00:00 2001
From: Oz <oz@certora.com>
Date: Mon, 4 Nov 2024 22:14:07 +0200
Subject: [PATCH 04/48] use just all

---
 .github/workflows/main.yml         |  10 ++++------
 platform-tools-osx-aarch64.tar.bz2 | Bin 0 -> 251 bytes
 2 files changed, 4 insertions(+), 6 deletions(-)
 create mode 100644 platform-tools-osx-aarch64.tar.bz2

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8fb3c6d..8b28243 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -14,9 +14,7 @@ jobs:
       - uses: actions/checkout@v4
       - name: Install just
         run: brew install just
-      # - name: Install dependencies
-      #   uses: extractions/setup-just@v1
-      #   with:
-      #     just-version: 1.5.0 
-      - name: Build
-        run: just package
\ No newline at end of file
+      - name: Prepare and build
+        run: just all
+      # - name: Build
+      #   run: just package
\ No newline at end of file
diff --git a/platform-tools-osx-aarch64.tar.bz2 b/platform-tools-osx-aarch64.tar.bz2
new file mode 100644
index 0000000000000000000000000000000000000000..94b859eb1d491de01c02779fc1d64e583267c68c
GIT binary patch
literal 251
zcmV<X00jR+T4*^jL0KkKS)CkyApiipe~{3C0H8nt|9}J{0wH-PpAZB<00=Mv8(A=t
z6iui!0D6rN)c^u1QJ~1tpv2LUkkcSkp(c-1G&Z1UG|7;DsqGFBygQ+Bf|-#f-ObH3
z(z?ifL!uI@!i)%ULwXQ|sAxhEp$QR;56)bjDdm@~RVy`8GL58(bT`6~<0Pq>#Danb
zLA?cGAyu%4Ap<67u>-?JjDfJLkb#g^h#f`4x(iTS2^2weGKH%Q;i}4^?|WqplD0yS
zx*jNVA3Pjk&K(B*dBqf#n1&_$A+jIMie^8MfOM$NIUx?`G$=>-yOJrwgoNnh@d&JR
BX^{W`

literal 0
HcmV?d00001


From b81731b1477691feeae2e4dbd7c1be318193e6ce Mon Sep 17 00:00:00 2001
From: Oz <oz@certora.com>
Date: Tue, 5 Nov 2024 07:17:02 +0200
Subject: [PATCH 05/48] install ninja

---
 .github/workflows/main.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8b28243..4d1eab2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -12,9 +12,7 @@ jobs:
       TAG: ${{ github.ref_name }}
     steps:
       - uses: actions/checkout@v4
-      - name: Install just
-        run: brew install just
+      - name: Install dependencies
+        run: brew install just ninja
       - name: Prepare and build
         run: just all
-      # - name: Build
-      #   run: just package
\ No newline at end of file

From 787da160113593c001e3aba368be5c89e2d046db Mon Sep 17 00:00:00 2001
From: Oz <oz@certora.com>
Date: Tue, 5 Nov 2024 08:41:17 +0200
Subject: [PATCH 06/48] add cargo update

---
 justfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/justfile b/justfile
index 9fd600c..813c0c0 100644
--- a/justfile
+++ b/justfile
@@ -30,7 +30,7 @@ build-cargo:
 	# AG: this fails for me with macport and libiconv
 	# AG: I have to disable libiconv, run this manually
 	# AG: and then re-enable it
-	cd {{ out_dir }}/cargo && env OPENSSL_STATIC=1 cargo build --release
+	cd {{ out_dir }}/cargo && cargo update && env OPENSSL_STATIC=1 cargo build --release
 
 [linux]
 build-cargo:

From 83a06e9f8f77d95ee1c07b567f8f387c0007fb1a Mon Sep 17 00:00:00 2001
From: Oz <oz@certora.com>
Date: Tue, 5 Nov 2024 10:16:20 +0200
Subject: [PATCH 07/48] print dir and upload artifact

---
 .github/workflows/main.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4d1eab2..912d252 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -16,3 +16,12 @@ jobs:
         run: brew install just ninja
       - name: Prepare and build
         run: just all
+      - name: Print dir
+        run: |
+          pwd
+          ls -lR
+      - uses: actions/upload-artifact@v4
+        with:
+          name: platform-tools-osx-aarch64.tar.bz2
+          path: /Users/runner/work/certora-solana-platform-tools/certora-solana-platform-tools/out/platform-tools-osx-aarch64.tar.bz2
+

From b924dd77ab44f4a43fb4a8ca970312f9b09f474a Mon Sep 17 00:00:00 2001
From: Oz <oz@certora.com>
Date: Tue, 5 Nov 2024 11:25:14 +0200
Subject: [PATCH 08/48] use relative path

---
 .github/workflows/main.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 912d252..84b9775 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -16,12 +16,8 @@ jobs:
         run: brew install just ninja
       - name: Prepare and build
         run: just all
-      - name: Print dir
-        run: |
-          pwd
-          ls -lR
       - uses: actions/upload-artifact@v4
         with:
           name: platform-tools-osx-aarch64.tar.bz2
-          path: /Users/runner/work/certora-solana-platform-tools/certora-solana-platform-tools/out/platform-tools-osx-aarch64.tar.bz2
+          path: out/platform-tools-osx-aarch64.tar.bz2
 

From c4b327cd37d65be9ea3826ca1861310fc27a69d9 Mon Sep 17 00:00:00 2001
From: Oz <oz@certora.com>
Date: Tue, 5 Nov 2024 19:00:32 +0200
Subject: [PATCH 09/48] separated actions

---
 .github/workflows/main.yml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 84b9775..20d4878 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -14,10 +14,17 @@ jobs:
       - uses: actions/checkout@v4
       - name: Install dependencies
         run: brew install just ninja
-      - name: Prepare and build
-        run: just all
+      - name: Clone
+        run: just clone
+      - name: Prepare
+        run: just prepare
+      - name: Build all
+        run: just build-all
+      - name: List files
+        run: ls -lR
+      - name: Package
+        run: just package
       - uses: actions/upload-artifact@v4
         with:
           name: platform-tools-osx-aarch64.tar.bz2
           path: out/platform-tools-osx-aarch64.tar.bz2
-

From 692e73489056e0375fc34ffff5376a60aef6ccd1 Mon Sep 17 00:00:00 2001
From: Oz <oz@certora.com>
Date: Wed, 6 Nov 2024 21:11:26 +0200
Subject: [PATCH 10/48] code sign llvm-objcopy

---
 .github/workflows/main.yml | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 20d4878..9164b8e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -18,10 +18,26 @@ jobs:
         run: just clone
       - name: Prepare
         run: just prepare
-      - name: Build all
+      - name: Build alls
         run: just build-all
-      - name: List files
-        run: ls -lR
+      - name: Create keychain
+        run: |
+          printf ${{ secrets.APPLE_P12_BASE64 }} | base64 -d > dev.p12
+          security create-keychain -p "${{ secrets.APPLE_TEMPKEYCHAIN_PASSWORD }}" "${{ secrets.APPLE_TEMPKEYCHAIN_NAME }}"
+          security list-keychains -d user -s "${{ secrets.APPLE_TEMPKEYCHAIN_NAME }}" $(security list-keychains -d user | tr -d '"')
+          security set-keychain-settings "${{ secrets.APPLE_TEMPKEYCHAIN_NAME }}"
+          security import dev.p12 -k "${{ secrets.APPLE_TEMPKEYCHAIN_NAME }}" -P "${{ secrets.APPLE_P12_PASSWORD }}" -T "/usr/bin/codesign"
+          security set-key-partition-list -S apple-tool:,apple: -s -k "${{ secrets.APPLE_TEMPKEYCHAIN_PASSWORD }}" -D "${{ secrets.APPLE_CODESIGN_IDENTITY }}" -t private ${{ secrets.APPLE_TEMPKEYCHAIN_NAME }}
+          security default-keychain -d user -s ${{ secrets.APPLE_TEMPKEYCHAIN_NAME }}
+          security unlock-keychain -p ${{ secrets.APPLE_TEMPKEYCHAIN_PASSWORD }} ${{ secrets.APPLE_TEMPKEYCHAIN_NAME }}
+      - name: Sign the binary
+        run: |
+          codesign -o runtime --timestamp -s "${{ secrets.APPLE_CODESIGN_IDENTITY }}" -v ./out/rust/build/aarch64-apple-darwin/llvm/bin/llvm-objcopy
+          ditto -c -k ./out/rust/build/aarch64-apple-darwin/llvm/bin/llvm-objcopy llvm-objcopy.zip
+      - name: Notarize
+        run: |
+          xcrun notarytool store-credentials --apple-id shelly@certora.com --password "${{ secrets.APPLE_CRED }}" --team-id "${{ secrets.APPLE_TEAMID }}" altool
+          xcrun notarytool submit llvm-objcopy.zip --keychain-profile altool --wait
       - name: Package
         run: just package
       - uses: actions/upload-artifact@v4

From e46bdb2a19ad8622a4e357d1102b45ee5d5d5f78 Mon Sep 17 00:00:00 2001
From: Oz <oz@certora.com>
Date: Sun, 17 Nov 2024 11:50:57 +0200
Subject: [PATCH 11/48] sign multiple files

---
 .github/workflows/main.yml | 27 ++++++++-------------------
 scripts/package.sh         | 14 ++++++++++++++
 scripts/sign.sh            | 28 ++++++++++++++++++++++++++++
 3 files changed, 50 insertions(+), 19 deletions(-)
 create mode 100644 scripts/sign.sh

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9164b8e..6749d2f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -18,27 +18,16 @@ jobs:
         run: just clone
       - name: Prepare
         run: just prepare
-      - name: Build alls
+      - name: Build rust, cargo and newlib
         run: just build-all
-      - name: Create keychain
-        run: |
-          printf ${{ secrets.APPLE_P12_BASE64 }} | base64 -d > dev.p12
-          security create-keychain -p "${{ secrets.APPLE_TEMPKEYCHAIN_PASSWORD }}" "${{ secrets.APPLE_TEMPKEYCHAIN_NAME }}"
-          security list-keychains -d user -s "${{ secrets.APPLE_TEMPKEYCHAIN_NAME }}" $(security list-keychains -d user | tr -d '"')
-          security set-keychain-settings "${{ secrets.APPLE_TEMPKEYCHAIN_NAME }}"
-          security import dev.p12 -k "${{ secrets.APPLE_TEMPKEYCHAIN_NAME }}" -P "${{ secrets.APPLE_P12_PASSWORD }}" -T "/usr/bin/codesign"
-          security set-key-partition-list -S apple-tool:,apple: -s -k "${{ secrets.APPLE_TEMPKEYCHAIN_PASSWORD }}" -D "${{ secrets.APPLE_CODESIGN_IDENTITY }}" -t private ${{ secrets.APPLE_TEMPKEYCHAIN_NAME }}
-          security default-keychain -d user -s ${{ secrets.APPLE_TEMPKEYCHAIN_NAME }}
-          security unlock-keychain -p ${{ secrets.APPLE_TEMPKEYCHAIN_PASSWORD }} ${{ secrets.APPLE_TEMPKEYCHAIN_NAME }}
-      - name: Sign the binary
-        run: |
-          codesign -o runtime --timestamp -s "${{ secrets.APPLE_CODESIGN_IDENTITY }}" -v ./out/rust/build/aarch64-apple-darwin/llvm/bin/llvm-objcopy
-          ditto -c -k ./out/rust/build/aarch64-apple-darwin/llvm/bin/llvm-objcopy llvm-objcopy.zip
-      - name: Notarize
-        run: |
-          xcrun notarytool store-credentials --apple-id shelly@certora.com --password "${{ secrets.APPLE_CRED }}" --team-id "${{ secrets.APPLE_TEAMID }}" altool
-          xcrun notarytool submit llvm-objcopy.zip --keychain-profile altool --wait
       - name: Package
+        env:
+          APPLE_CODESIGN_IDENTITY: {{ secrets.APPLE_CODESIGN_IDENTITY }}
+          APPLE_CRED: {{ secrets.APPLE_CRED }}
+          APPLE_P12_BASE64: {{ secrets.APPLE_P12_BASE64 }}
+          APPLE_P12_PASSWORD: {{ secrets.APPLE_P12_PASSWORD }}
+          APPLE_TEAMID: {{ secrets.APPLE_TEAMID }}
+          APPLE_TEMPKEYCHAIN_PASSWORD: {{ secrets.APPLE_TEMPKEYCHAIN_PASSWORD }}
         run: just package
       - uses: actions/upload-artifact@v4
         with:
diff --git a/scripts/package.sh b/scripts/package.sh
index 65551d3..c4f366e 100755
--- a/scripts/package.sh
+++ b/scripts/package.sh
@@ -82,6 +82,20 @@ if [[ "${HOST_TRIPLE}" != "x86_64-pc-windows-msvc" ]] ; then
     #cp -R rust/build/${HOST_TRIPLE}/llvm/lib/python* deploy/llvm/lib/
 fi
 
+if [[ $HOST_TRIPLE == *apple-darwin* ]]; then
+    pwd; ls -l # TODO: remove this
+    
+    RUST_BIN="./deploy/rust/bin"
+    LLVM_BIN="./deploy/llvm/bin"
+
+    ./sign.sh "$RUST_BIN/rustc" \
+        "$RUST_BIN/rustdoc" \
+        "$RUST_BIN/cargo" \
+        "$LLVM_BIN/llvm-objdump" \
+        "$LLVM_BIN/llvm-ar" \
+        "$LLVM_BIN/llvm-readobj" \
+        "$LLVM_BIN/llvm-objcopy"
+
 # Check the Rust binaries
 while IFS= read -r f
 do
diff --git a/scripts/sign.sh b/scripts/sign.sh
new file mode 100644
index 0000000..61fa22a
--- /dev/null
+++ b/scripts/sign.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+set -ex
+
+FILES_TO_SIGN=$@
+
+for FILE_PATH in "${FILES_TO_SIGN[@]}"; do
+    FILE_NAME=$(basename $FILE_PATH)
+    APPLE_TEMPKEYCHAIN_NAME=$(echo $FILE_NAME | tr -cd 'a-zA-Z')$(($RANDOM))
+    
+    echo "File path: $FILE_PATH"
+    echo "File name: $FILE_NAME"
+    echo "Apple temp keychain name: $APPLE_TEMPKEYCHAIN_NAME"
+
+    printf "$APPLE_P12_BASE64" | base64 -d > dev.p12
+    security create-keychain -p "$APPLE_TEMPKEYCHAIN_PASSWORD" "$APPLE_TEMPKEYCHAIN_NAME"
+    security list-keychains -d user -s "$APPLE_TEMPKEYCHAIN_NAME" $(security list-keychains -d user | tr -d '"')
+    security set-keychain-settings "$APPLE_TEMPKEYCHAIN_NAME"
+    security import dev.p12 -k "$APPLE_TEMPKEYCHAIN_NAME" -P "$APPLE_P12_PASSWORD" -T "/usr/bin/codesign"
+    security set-key-partition-list -S apple-tool:,apple: -s -k "$APPLE_TEMPKEYCHAIN_PASSWORD" -D "$APPLE_CODESIGN_IDENTITY" -t private "$APPLE_TEMPKEYCHAIN_NAME"
+    security default-keychain -d user -s "$APPLE_TEMPKEYCHAIN_NAME"
+    security unlock-keychain -p "$APPLE_TEMPKEYCHAIN_PASSWORD" "$APPLE_TEMPKEYCHAIN_NAME"
+
+    codesign -o runtime --force --timestamp -s "$APPLE_CODESIGN_IDENTITY" -v $FILE_PATH
+
+    ditto -c -k $FILE_PATH $FILE_NAME.zip
+    xcrun notarytool store-credentials --apple-id shelly@certora.com --password "$APPLE_CRED" --team-id "$APPLE_TEAMID" altool
+    xcrun notarytool submit $FILE_NAME.zip --keychain-profile altool --wait
+done

From a034d34513ad8fee738bb7fe4647445939aab988 Mon Sep 17 00:00:00 2001
From: Oz <oz@certora.com>
Date: Sun, 17 Nov 2024 11:54:15 +0200
Subject: [PATCH 12/48] fix secrets

---
 .github/workflows/main.yml | 12 ++++++------
 scripts/package.sh         |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6749d2f..c01c041 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -22,12 +22,12 @@ jobs:
         run: just build-all
       - name: Package
         env:
-          APPLE_CODESIGN_IDENTITY: {{ secrets.APPLE_CODESIGN_IDENTITY }}
-          APPLE_CRED: {{ secrets.APPLE_CRED }}
-          APPLE_P12_BASE64: {{ secrets.APPLE_P12_BASE64 }}
-          APPLE_P12_PASSWORD: {{ secrets.APPLE_P12_PASSWORD }}
-          APPLE_TEAMID: {{ secrets.APPLE_TEAMID }}
-          APPLE_TEMPKEYCHAIN_PASSWORD: {{ secrets.APPLE_TEMPKEYCHAIN_PASSWORD }}
+          APPLE_CODESIGN_IDENTITY: ${{ secrets.APPLE_CODESIGN_IDENTITY }}
+          APPLE_CRED: ${{ secrets.APPLE_CRED }}
+          APPLE_P12_BASE64: ${{ secrets.APPLE_P12_BASE64 }}
+          APPLE_P12_PASSWORD: ${{ secrets.APPLE_P12_PASSWORD }}
+          APPLE_TEAMID: ${{ secrets.APPLE_TEAMID }}
+          APPLE_TEMPKEYCHAIN_PASSWORD: ${{ secrets.APPLE_TEMPKEYCHAIN_PASSWORD }}
         run: just package
       - uses: actions/upload-artifact@v4
         with:
diff --git a/scripts/package.sh b/scripts/package.sh
index c4f366e..5e15463 100755
--- a/scripts/package.sh
+++ b/scripts/package.sh
@@ -82,6 +82,7 @@ if [[ "${HOST_TRIPLE}" != "x86_64-pc-windows-msvc" ]] ; then
     #cp -R rust/build/${HOST_TRIPLE}/llvm/lib/python* deploy/llvm/lib/
 fi
 
+# Sign macOS binaries
 if [[ $HOST_TRIPLE == *apple-darwin* ]]; then
     pwd; ls -l # TODO: remove this
     

From 44622a425402d4277adf08c01a2841df2e940501 Mon Sep 17 00:00:00 2001
From: Oz <oz@certora.com>
Date: Sun, 17 Nov 2024 12:02:39 +0200
Subject: [PATCH 13/48] add linux support

---
 .github/workflows/main.yml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c01c041..4f0bc9c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -33,3 +33,23 @@ jobs:
         with:
           name: platform-tools-osx-aarch64.tar.bz2
           path: out/platform-tools-osx-aarch64.tar.bz2
+  build-linux:
+    runs-on: ubuntu-latest
+    env:
+      TAG: ${{ github.ref_name }}
+    steps:
+      - uses: actions/checkout@v4
+      # - name: Install dependencies
+      #   run: apt install git
+      - name: Clone
+        run: just clone
+      - name: Prepare
+        run: just prepare
+      - name: Build rust, cargo and newlib
+        run: just build-all
+      - name: Package
+        run: just package
+      - uses: actions/upload-artifact@v4
+        with:
+          name: platform-tools-linux-x86_64.tar.bz2
+          path: out/platform-tools-linux-x86_64.tar.bz2

From a041388bcbea45bf983a4c288e8e1d2c41b5d181 Mon Sep 17 00:00:00 2001
From: Oz <oz@certora.com>
Date: Sun, 17 Nov 2024 12:04:25 +0200
Subject: [PATCH 14/48] install just

---
 .github/workflows/main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4f0bc9c..142cb6e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -39,8 +39,8 @@ jobs:
       TAG: ${{ github.ref_name }}
     steps:
       - uses: actions/checkout@v4
-      # - name: Install dependencies
-      #   run: apt install git
+      - name: Install dependencies
+        run: apt install just
       - name: Clone
         run: just clone
       - name: Prepare

From b89ecac1a2f507c339f60db1a1d00ac2440dffab Mon Sep 17 00:00:00 2001
From: Oz <oz@certora.com>
Date: Sun, 17 Nov 2024 12:06:45 +0200
Subject: [PATCH 15/48] run linux only for testing

---
 .github/workflows/main.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 142cb6e..6f65a2d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -3,11 +3,12 @@ name: Build Tools
 on:
   push:
     branches:
-      - oz/ci
+      - oz/ci # TODO: change this
 
 jobs:
   build-mac:
     runs-on: macos-latest
+    needs: build-linux # TODO: remove this
     env:
       TAG: ${{ github.ref_name }}
     steps:
@@ -33,6 +34,7 @@ jobs:
         with:
           name: platform-tools-osx-aarch64.tar.bz2
           path: out/platform-tools-osx-aarch64.tar.bz2
+
   build-linux:
     runs-on: ubuntu-latest
     env:

From 7e7b23ad7d4a6efa15e933b93df4db976fb1e7a1 Mon Sep 17 00:00:00 2001
From: Oz <oz@certora.com>
Date: Sun, 17 Nov 2024 12:07:25 +0200
Subject: [PATCH 16/48] try with sudo

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6f65a2d..d6ed6dd 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -42,7 +42,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Install dependencies
-        run: apt install just
+        run: sudo apt install just
       - name: Clone
         run: just clone
       - name: Prepare

From 125037dc799aed57e78fc64078ce7e4a5838bbd5 Mon Sep 17 00:00:00 2001
From: Oz <oz@certora.com>
Date: Sun, 17 Nov 2024 12:09:34 +0200
Subject: [PATCH 17/48] apt update

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d6ed6dd..f456f47 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -42,7 +42,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Install dependencies
-        run: sudo apt install just
+        run: sudo apt update; sudo apt install just
       - name: Clone
         run: just clone
       - name: Prepare

From 19b7282d0fae4088ce17598717e05c859469bcce Mon Sep 17 00:00:00 2001
From: Oz <oz@certora.com>
Date: Sun, 17 Nov 2024 12:11:52 +0200
Subject: [PATCH 18/48] install just with dedicated action

---
 .github/workflows/main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f456f47..9fafa88 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -41,8 +41,8 @@ jobs:
       TAG: ${{ github.ref_name }}
     steps:
       - uses: actions/checkout@v4
-      - name: Install dependencies
-        run: sudo apt update; sudo apt install just
+      - name: Install just
+        uses: taiki-e/install-action@just
       - name: Clone
         run: just clone
       - name: Prepare

From 0c064bdc6ed95f614bdad4cff8761016297bf79c Mon Sep 17 00:00:00 2001
From: Oz <oz@certora.com>
Date: Sun, 17 Nov 2024 12:17:00 +0200
Subject: [PATCH 19/48] install ninja

---
 .github/workflows/main.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9fafa88..4c4c2a9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -43,6 +43,8 @@ jobs:
       - uses: actions/checkout@v4
       - name: Install just
         uses: taiki-e/install-action@just
+      - name: Install ninja
+        run: sudo apt update; sudo apt install ninja-build
       - name: Clone
         run: just clone
       - name: Prepare

From d45da7360b4bbaa6a7bfb1c63ca8e7ad36b697d2 Mon Sep 17 00:00:00 2001
From: Oz <oz@certora.com>
Date: Sun, 17 Nov 2024 13:27:23 +0200
Subject: [PATCH 20/48] fix if

---
 .github/workflows/main.yml | 3 ++-
 scripts/package.sh         | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4c4c2a9..5a0ffc3 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   build-mac:
     runs-on: macos-latest
-    needs: build-linux # TODO: remove this
+    # needs: build-linux # TODO: remove this
     env:
       TAG: ${{ github.ref_name }}
     steps:
@@ -37,6 +37,7 @@ jobs:
 
   build-linux:
     runs-on: ubuntu-latest
+    needs: build-mac # TODO: remove this
     env:
       TAG: ${{ github.ref_name }}
     steps:
diff --git a/scripts/package.sh b/scripts/package.sh
index 5e15463..2f0c49b 100755
--- a/scripts/package.sh
+++ b/scripts/package.sh
@@ -96,6 +96,7 @@ if [[ $HOST_TRIPLE == *apple-darwin* ]]; then
         "$LLVM_BIN/llvm-ar" \
         "$LLVM_BIN/llvm-readobj" \
         "$LLVM_BIN/llvm-objcopy"
+fi
 
 # Check the Rust binaries
 while IFS= read -r f

From 2800c8cab7cd0c459724bfebf15312adccfe4fb1 Mon Sep 17 00:00:00 2001
From: Oz <oz@certora.com>
Date: Sun, 17 Nov 2024 14:08:22 +0200
Subject: [PATCH 21/48] update cargo

---
 .github/workflows/main.yml | 4 ++--
 justfile                   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5a0ffc3..78fc41d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   build-mac:
     runs-on: macos-latest
-    # needs: build-linux # TODO: remove this
+    needs: build-linux # TODO: remove this
     env:
       TAG: ${{ github.ref_name }}
     steps:
@@ -37,7 +37,7 @@ jobs:
 
   build-linux:
     runs-on: ubuntu-latest
-    needs: build-mac # TODO: remove this
+    # needs: build-mac # TODO: remove this
     env:
       TAG: ${{ github.ref_name }}
     steps:
diff --git a/justfile b/justfile
index 813c0c0..28f11d5 100644
--- a/justfile
+++ b/justfile
@@ -34,7 +34,7 @@ build-cargo:
 
 [linux]
 build-cargo:
-	cd {{ out_dir }}/cargo && env OPENSSL_STATIC=1 OPENSSL_LIB_DIR=/usr/lib/x86_64-linux-gnu OPENSSL_INCLUDE_DIR=/usr/include/openssl cargo build --release
+	cd {{ out_dir }}/cargo && cargo update && env OPENSSL_STATIC=1 OPENSSL_LIB_DIR=/usr/lib/x86_64-linux-gnu OPENSSL_INCLUDE_DIR=/usr/include/openssl cargo build --release
 
 
 [linux,macos]

From 075bb4e8139ba443e74698a1febe5ae56a2d982b Mon Sep 17 00:00:00 2001
From: Oz <oz@certora.com>
Date: Sun, 17 Nov 2024 14:31:47 +0200
Subject: [PATCH 22/48] fix path

---
 .github/workflows/main.yml | 4 ++--
 scripts/package.sh         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 78fc41d..5a0ffc3 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   build-mac:
     runs-on: macos-latest
-    needs: build-linux # TODO: remove this
+    # needs: build-linux # TODO: remove this
     env:
       TAG: ${{ github.ref_name }}
     steps:
@@ -37,7 +37,7 @@ jobs:
 
   build-linux:
     runs-on: ubuntu-latest
-    # needs: build-mac # TODO: remove this
+    needs: build-mac # TODO: remove this
     env:
       TAG: ${{ github.ref_name }}
     steps:
diff --git a/scripts/package.sh b/scripts/package.sh
index 2f0c49b..55c2656 100755
--- a/scripts/package.sh
+++ b/scripts/package.sh
@@ -89,7 +89,7 @@ if [[ $HOST_TRIPLE == *apple-darwin* ]]; then
     RUST_BIN="./deploy/rust/bin"
     LLVM_BIN="./deploy/llvm/bin"
 
-    ./sign.sh "$RUST_BIN/rustc" \
+    ./scripts/sign.sh "$RUST_BIN/rustc" \
         "$RUST_BIN/rustdoc" \
         "$RUST_BIN/cargo" \
         "$LLVM_BIN/llvm-objdump" \

From 4ae9ef61350f54e6943cf685ec6069807e11ad22 Mon Sep 17 00:00:00 2001
From: Oz <oz@certora.com>
Date: Sun, 17 Nov 2024 15:41:23 +0200
Subject: [PATCH 23/48] fix loop and sign script path

---
 scripts/package.sh | 2 +-
 scripts/sign.sh    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/package.sh b/scripts/package.sh
index 55c2656..1177244 100755
--- a/scripts/package.sh
+++ b/scripts/package.sh
@@ -89,7 +89,7 @@ if [[ $HOST_TRIPLE == *apple-darwin* ]]; then
     RUST_BIN="./deploy/rust/bin"
     LLVM_BIN="./deploy/llvm/bin"
 
-    ./scripts/sign.sh "$RUST_BIN/rustc" \
+    ../scripts/sign.sh "$RUST_BIN/rustc" \
         "$RUST_BIN/rustdoc" \
         "$RUST_BIN/cargo" \
         "$LLVM_BIN/llvm-objdump" \
diff --git a/scripts/sign.sh b/scripts/sign.sh
index 61fa22a..821f455 100644
--- a/scripts/sign.sh
+++ b/scripts/sign.sh
@@ -3,7 +3,7 @@ set -ex
 
 FILES_TO_SIGN=$@
 
-for FILE_PATH in "${FILES_TO_SIGN[@]}"; do
+for FILE_PATH in "$FILES_TO_SIGN"; do
     FILE_NAME=$(basename $FILE_PATH)
     APPLE_TEMPKEYCHAIN_NAME=$(echo $FILE_NAME | tr -cd 'a-zA-Z')$(($RANDOM))
     

From 623984d7029f94e734b165af49e7eb5385a947d9 Mon Sep 17 00:00:00 2001
From: Oz <oz@certora.com>
Date: Sun, 17 Nov 2024 16:06:50 +0200
Subject: [PATCH 24/48] sign rust lib

---
 scripts/package.sh | 16 +++++++++++-----
 scripts/sign.sh    |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 scripts/sign.sh

diff --git a/scripts/package.sh b/scripts/package.sh
index 1177244..8ed77c0 100755
--- a/scripts/package.sh
+++ b/scripts/package.sh
@@ -86,16 +86,22 @@ fi
 if [[ $HOST_TRIPLE == *apple-darwin* ]]; then
     pwd; ls -l # TODO: remove this
     
-    RUST_BIN="./deploy/rust/bin"
     LLVM_BIN="./deploy/llvm/bin"
+    RUST_BIN="./deploy/rust/bin"
+    RUST_LIB="./deploy/rust/lib"
 
-    ../scripts/sign.sh "$RUST_BIN/rustc" \
-        "$RUST_BIN/rustdoc" \
-        "$RUST_BIN/cargo" \
+    ../scripts/sign.sh \
         "$LLVM_BIN/llvm-objdump" \
         "$LLVM_BIN/llvm-ar" \
         "$LLVM_BIN/llvm-readobj" \
-        "$LLVM_BIN/llvm-objcopy"
+        "$LLVM_BIN/llvm-objcopy" \
+        "$RUST_BIN/rustc" \
+        "$RUST_BIN/rustdoc" \
+        "$RUST_BIN/cargo" \
+        "$RUST_LIB/librustc_driver-b4e91886a4c059a0.dylib" \
+        "$RUST_LIB/libstd-6eff127b55c063c2.dylib" \
+        "$RUST_LIB/libtest-090d77c63b6e9f11.dylib"\
+
 fi
 
 # Check the Rust binaries
diff --git a/scripts/sign.sh b/scripts/sign.sh
old mode 100644
new mode 100755
index 821f455..927fff1
--- a/scripts/sign.sh
+++ b/scripts/sign.sh
@@ -5,7 +5,7 @@ FILES_TO_SIGN=$@
 
 for FILE_PATH in "$FILES_TO_SIGN"; do
     FILE_NAME=$(basename $FILE_PATH)
-    APPLE_TEMPKEYCHAIN_NAME=$(echo $FILE_NAME | tr -cd 'a-zA-Z')$(($RANDOM))
+    APPLE_TEMPKEYCHAIN_NAME=$(echo $FILE_NAME | tr -cd 'a-zA-Z')$(($RANDOM)) # creating a random name
     
     echo "File path: $FILE_PATH"
     echo "File name: $FILE_NAME"

From 016c5fadcfea413eab404c9581d4fa2fbb2f94fa Mon Sep 17 00:00:00 2001
From: Oz <oz@certora.com>
Date: Sun, 17 Nov 2024 16:39:31 +0200
Subject: [PATCH 25/48] temporary remove sign.sh

---
 scripts/sign.sh | 28 ----------------------------
 1 file changed, 28 deletions(-)
 delete mode 100755 scripts/sign.sh

diff --git a/scripts/sign.sh b/scripts/sign.sh
deleted file mode 100755
index 927fff1..0000000
--- a/scripts/sign.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-set -ex
-
-FILES_TO_SIGN=$@
-
-for FILE_PATH in "$FILES_TO_SIGN"; do
-    FILE_NAME=$(basename $FILE_PATH)
-    APPLE_TEMPKEYCHAIN_NAME=$(echo $FILE_NAME | tr -cd 'a-zA-Z')$(($RANDOM)) # creating a random name
-    
-    echo "File path: $FILE_PATH"
-    echo "File name: $FILE_NAME"
-    echo "Apple temp keychain name: $APPLE_TEMPKEYCHAIN_NAME"
-
-    printf "$APPLE_P12_BASE64" | base64 -d > dev.p12
-    security create-keychain -p "$APPLE_TEMPKEYCHAIN_PASSWORD" "$APPLE_TEMPKEYCHAIN_NAME"
-    security list-keychains -d user -s "$APPLE_TEMPKEYCHAIN_NAME" $(security list-keychains -d user | tr -d '"')
-    security set-keychain-settings "$APPLE_TEMPKEYCHAIN_NAME"
-    security import dev.p12 -k "$APPLE_TEMPKEYCHAIN_NAME" -P "$APPLE_P12_PASSWORD" -T "/usr/bin/codesign"
-    security set-key-partition-list -S apple-tool:,apple: -s -k "$APPLE_TEMPKEYCHAIN_PASSWORD" -D "$APPLE_CODESIGN_IDENTITY" -t private "$APPLE_TEMPKEYCHAIN_NAME"
-    security default-keychain -d user -s "$APPLE_TEMPKEYCHAIN_NAME"
-    security unlock-keychain -p "$APPLE_TEMPKEYCHAIN_PASSWORD" "$APPLE_TEMPKEYCHAIN_NAME"
-
-    codesign -o runtime --force --timestamp -s "$APPLE_CODESIGN_IDENTITY" -v $FILE_PATH
-
-    ditto -c -k $FILE_PATH $FILE_NAME.zip
-    xcrun notarytool store-credentials --apple-id shelly@certora.com --password "$APPLE_CRED" --team-id "$APPLE_TEAMID" altool
-    xcrun notarytool submit $FILE_NAME.zip --keychain-profile altool --wait
-done

From 620e52da3413688cb87842f2c723a8d7cb077d2a Mon Sep 17 00:00:00 2001
From: Oz <oz@certora.com>
Date: Sun, 17 Nov 2024 16:40:08 +0200
Subject: [PATCH 26/48] restore sign.sh

---
 scripts/sign.sh | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100755 scripts/sign.sh

diff --git a/scripts/sign.sh b/scripts/sign.sh
new file mode 100755
index 0000000..47267fa
--- /dev/null
+++ b/scripts/sign.sh
@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+set -ex
+
+FILES_TO_SIGN=$@
+
+for FILE_PATH in "$FILES_TO_SIGN"; do
+    FILE_NAME=$(basename $FILE_PATH)
+    APPLE_TEMPKEYCHAIN_NAME=$(echo $FILE_NAME | tr -cd 'a-zA-Z')$(($RANDOM)) # use a random name
+    
+    echo "File path: $FILE_PATH"
+    echo "File name: $FILE_NAME"
+    echo "Apple temp keychain name: $APPLE_TEMPKEYCHAIN_NAME"
+
+    # create keychain
+    printf "$APPLE_P12_BASE64" | base64 -d > dev.p12
+    security create-keychain -p "$APPLE_TEMPKEYCHAIN_PASSWORD" "$APPLE_TEMPKEYCHAIN_NAME"
+    security list-keychains -d user -s "$APPLE_TEMPKEYCHAIN_NAME" $(security list-keychains -d user | tr -d '"')
+    security set-keychain-settings "$APPLE_TEMPKEYCHAIN_NAME"
+    security import dev.p12 -k "$APPLE_TEMPKEYCHAIN_NAME" -P "$APPLE_P12_PASSWORD" -T "/usr/bin/codesign"
+    security set-key-partition-list -S apple-tool:,apple: -s -k "$APPLE_TEMPKEYCHAIN_PASSWORD" -D "$APPLE_CODESIGN_IDENTITY" -t private "$APPLE_TEMPKEYCHAIN_NAME"
+    security default-keychain -d user -s "$APPLE_TEMPKEYCHAIN_NAME"
+    security unlock-keychain -p "$APPLE_TEMPKEYCHAIN_PASSWORD" "$APPLE_TEMPKEYCHAIN_NAME"
+
+    # sign the binary
+    codesign -o runtime --force --timestamp -s "$APPLE_CODESIGN_IDENTITY" -v $FILE_PATH
+
+    # notarize binary
+    ditto -c -k $FILE_PATH $FILE_NAME.zip # notarization require zip files
+    xcrun notarytool store-credentials --apple-id shelly@certora.com --password "$APPLE_CRED" --team-id "$APPLE_TEAMID" altool
+    xcrun notarytool submit $FILE_NAME.zip --keychain-profile altool --wait
+done

From 9a662ba4ad99e38b90156925c8d5ded72c4a057a Mon Sep 17 00:00:00 2001
From: Oz <oz@certora.com>
Date: Sun, 17 Nov 2024 17:54:24 +0200
Subject: [PATCH 27/48] no quotation marks

---
 scripts/sign.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/sign.sh b/scripts/sign.sh
index 47267fa..9f96c1d 100755
--- a/scripts/sign.sh
+++ b/scripts/sign.sh
@@ -3,7 +3,7 @@ set -ex
 
 FILES_TO_SIGN=$@
 
-for FILE_PATH in "$FILES_TO_SIGN"; do
+for FILE_PATH in $FILES_TO_SIGN; do
     FILE_NAME=$(basename $FILE_PATH)
     APPLE_TEMPKEYCHAIN_NAME=$(echo $FILE_NAME | tr -cd 'a-zA-Z')$(($RANDOM)) # use a random name
     

From 497553964b0fbab3c1a55d24cb65a15e0975cdc5 Mon Sep 17 00:00:00 2001
From: Oz <oz@certora.com>
Date: Sun, 17 Nov 2024 18:57:49 +0200
Subject: [PATCH 28/48] run both macos and linux

---
 .github/workflows/main.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5a0ffc3..a070750 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -8,7 +8,6 @@ on:
 jobs:
   build-mac:
     runs-on: macos-latest
-    # needs: build-linux # TODO: remove this
     env:
       TAG: ${{ github.ref_name }}
     steps:
@@ -37,7 +36,6 @@ jobs:
 
   build-linux:
     runs-on: ubuntu-latest
-    needs: build-mac # TODO: remove this
     env:
       TAG: ${{ github.ref_name }}
     steps:

From 6e81e4df508dde86568bf2edff1dace0599b518f Mon Sep 17 00:00:00 2001
From: Oz <oz@certora.com>
Date: Sun, 17 Nov 2024 20:48:48 +0200
Subject: [PATCH 29/48] [skip ci] remove comment

---
 scripts/package.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/scripts/package.sh b/scripts/package.sh
index 8ed77c0..7fca9dd 100755
--- a/scripts/package.sh
+++ b/scripts/package.sh
@@ -84,8 +84,6 @@ fi
 
 # Sign macOS binaries
 if [[ $HOST_TRIPLE == *apple-darwin* ]]; then
-    pwd; ls -l # TODO: remove this
-    
     LLVM_BIN="./deploy/llvm/bin"
     RUST_BIN="./deploy/rust/bin"
     RUST_LIB="./deploy/rust/lib"

From 27611edf99256f22069680b7b625a741a88ed4d0 Mon Sep 17 00:00:00 2001
From: Oz <oz@certora.com>
Date: Mon, 18 Nov 2024 10:46:55 +0200
Subject: [PATCH 30/48] create a release with artifacts

---
 .github/workflows/main.yml | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a070750..e7c1791 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -3,7 +3,10 @@ name: Build Tools
 on:
   push:
     branches:
-      - oz/ci # TODO: change this
+      - oz/ci # TODO: remove this
+      - main
+    tags: ['*']
+  workflow_dispatch:
 
 jobs:
   build-mac:
@@ -56,3 +59,26 @@ jobs:
         with:
           name: platform-tools-linux-x86_64.tar.bz2
           path: out/platform-tools-linux-x86_64.tar.bz2
+
+  release:
+    runs-on: ubuntu-latest
+    needs: [build-linux, build-mac]
+    if: startsWith(github.event.ref, 'refs/tags/') #  only on new tag creation
+    env:
+      TAG: ${{ github.ref_name }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Download artifact
+        uses: actions/download-artifact@v4
+      - name: Create a release
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          release_exist=$(gh release view $TAG 2>&1 || exit 0)
+          if [ "$release_exist" = "release not found" ]; then
+            gh release create $TAG platform-tools-osx-aarch64.tar.bz2/platform-tools-osx-aarch64.tar.bz2 --title "Release $TAG" --generate-notes --latest
+            gh release upload $TAG platform-tools-linux-x86_64.tar.bz2/platform-tools-linux-x86_64.tar.bz2
+          else
+            gh release upload $TAG platform-tools-osx-aarch64.tar.bz2/platform-tools-osx-aarch64.tar.bz2
+            gh release upload $TAG platform-tools-linux-x86_64.tar.bz2/platform-tools-linux-x86_64.tar.bz2
+          fi

From b4a573ffbbc0f9c179f8ca49994938b08539271f Mon Sep 17 00:00:00 2001
From: Oz <oz@certora.com>
Date: Tue, 19 Nov 2024 22:35:17 +0200
Subject: [PATCH 31/48] disable binaries signing for macos temporary

---
 scripts/package.sh | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/scripts/package.sh b/scripts/package.sh
index 7fca9dd..942f53a 100755
--- a/scripts/package.sh
+++ b/scripts/package.sh
@@ -83,24 +83,27 @@ if [[ "${HOST_TRIPLE}" != "x86_64-pc-windows-msvc" ]] ; then
 fi
 
 # Sign macOS binaries
-if [[ $HOST_TRIPLE == *apple-darwin* ]]; then
-    LLVM_BIN="./deploy/llvm/bin"
-    RUST_BIN="./deploy/rust/bin"
-    RUST_LIB="./deploy/rust/lib"
 
-    ../scripts/sign.sh \
-        "$LLVM_BIN/llvm-objdump" \
-        "$LLVM_BIN/llvm-ar" \
-        "$LLVM_BIN/llvm-readobj" \
-        "$LLVM_BIN/llvm-objcopy" \
-        "$RUST_BIN/rustc" \
-        "$RUST_BIN/rustdoc" \
-        "$RUST_BIN/cargo" \
-        "$RUST_LIB/librustc_driver-b4e91886a4c059a0.dylib" \
-        "$RUST_LIB/libstd-6eff127b55c063c2.dylib" \
-        "$RUST_LIB/libtest-090d77c63b6e9f11.dylib"\
+# TODO: restore this
 
-fi
+# if [[ $HOST_TRIPLE == *apple-darwin* ]]; then
+#     LLVM_BIN="./deploy/llvm/bin"
+#     RUST_BIN="./deploy/rust/bin"
+#     RUST_LIB="./deploy/rust/lib"
+
+#     ../scripts/sign.sh \
+#         "$LLVM_BIN/llvm-objdump" \
+#         "$LLVM_BIN/llvm-ar" \
+#         "$LLVM_BIN/llvm-readobj" \
+#         "$LLVM_BIN/llvm-objcopy" \
+#         "$RUST_BIN/rustc" \
+#         "$RUST_BIN/rustdoc" \
+#         "$RUST_BIN/cargo" \
+#         "$RUST_LIB/librustc_driver-b4e91886a4c059a0.dylib" \
+#         "$RUST_LIB/libstd-6eff127b55c063c2.dylib" \
+#         "$RUST_LIB/libtest-090d77c63b6e9f11.dylib"\
+
+# fi
 
 # Check the Rust binaries
 while IFS= read -r f

From 6a859cd04e27c49c5987c3f8b56681960a5a5749 Mon Sep 17 00:00:00 2001
From: Oz <oz@certora.com>
Date: Wed, 27 Nov 2024 15:45:16 +0200
Subject: [PATCH 32/48] restore signing and remove zip file from root dir

---
 platform-tools-osx-aarch64.tar.bz2 | Bin 251 -> 0 bytes
 scripts/package.sh                 |  35 +++++++++++++----------------
 2 files changed, 16 insertions(+), 19 deletions(-)
 delete mode 100644 platform-tools-osx-aarch64.tar.bz2

diff --git a/platform-tools-osx-aarch64.tar.bz2 b/platform-tools-osx-aarch64.tar.bz2
deleted file mode 100644
index 94b859eb1d491de01c02779fc1d64e583267c68c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 251
zcmV<X00jR+T4*^jL0KkKS)CkyApiipe~{3C0H8nt|9}J{0wH-PpAZB<00=Mv8(A=t
z6iui!0D6rN)c^u1QJ~1tpv2LUkkcSkp(c-1G&Z1UG|7;DsqGFBygQ+Bf|-#f-ObH3
z(z?ifL!uI@!i)%ULwXQ|sAxhEp$QR;56)bjDdm@~RVy`8GL58(bT`6~<0Pq>#Danb
zLA?cGAyu%4Ap<67u>-?JjDfJLkb#g^h#f`4x(iTS2^2weGKH%Q;i}4^?|WqplD0yS
zx*jNVA3Pjk&K(B*dBqf#n1&_$A+jIMie^8MfOM$NIUx?`G$=>-yOJrwgoNnh@d&JR
BX^{W`

diff --git a/scripts/package.sh b/scripts/package.sh
index 942f53a..7fca9dd 100755
--- a/scripts/package.sh
+++ b/scripts/package.sh
@@ -83,27 +83,24 @@ if [[ "${HOST_TRIPLE}" != "x86_64-pc-windows-msvc" ]] ; then
 fi
 
 # Sign macOS binaries
+if [[ $HOST_TRIPLE == *apple-darwin* ]]; then
+    LLVM_BIN="./deploy/llvm/bin"
+    RUST_BIN="./deploy/rust/bin"
+    RUST_LIB="./deploy/rust/lib"
 
-# TODO: restore this
+    ../scripts/sign.sh \
+        "$LLVM_BIN/llvm-objdump" \
+        "$LLVM_BIN/llvm-ar" \
+        "$LLVM_BIN/llvm-readobj" \
+        "$LLVM_BIN/llvm-objcopy" \
+        "$RUST_BIN/rustc" \
+        "$RUST_BIN/rustdoc" \
+        "$RUST_BIN/cargo" \
+        "$RUST_LIB/librustc_driver-b4e91886a4c059a0.dylib" \
+        "$RUST_LIB/libstd-6eff127b55c063c2.dylib" \
+        "$RUST_LIB/libtest-090d77c63b6e9f11.dylib"\
 
-# if [[ $HOST_TRIPLE == *apple-darwin* ]]; then
-#     LLVM_BIN="./deploy/llvm/bin"
-#     RUST_BIN="./deploy/rust/bin"
-#     RUST_LIB="./deploy/rust/lib"
-
-#     ../scripts/sign.sh \
-#         "$LLVM_BIN/llvm-objdump" \
-#         "$LLVM_BIN/llvm-ar" \
-#         "$LLVM_BIN/llvm-readobj" \
-#         "$LLVM_BIN/llvm-objcopy" \
-#         "$RUST_BIN/rustc" \
-#         "$RUST_BIN/rustdoc" \
-#         "$RUST_BIN/cargo" \
-#         "$RUST_LIB/librustc_driver-b4e91886a4c059a0.dylib" \
-#         "$RUST_LIB/libstd-6eff127b55c063c2.dylib" \
-#         "$RUST_LIB/libtest-090d77c63b6e9f11.dylib"\
-
-# fi
+fi
 
 # Check the Rust binaries
 while IFS= read -r f

From 0a0cfcdd8ca9103548c8b4179f3fc17d927e190d Mon Sep 17 00:00:00 2001
From: Oz <oz@certora.com>
Date: Thu, 28 Nov 2024 09:55:26 +0200
Subject: [PATCH 33/48] disable signing temporary

---
 scripts/package.sh | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/scripts/package.sh b/scripts/package.sh
index 7fca9dd..e6b8574 100755
--- a/scripts/package.sh
+++ b/scripts/package.sh
@@ -83,24 +83,23 @@ if [[ "${HOST_TRIPLE}" != "x86_64-pc-windows-msvc" ]] ; then
 fi
 
 # Sign macOS binaries
-if [[ $HOST_TRIPLE == *apple-darwin* ]]; then
-    LLVM_BIN="./deploy/llvm/bin"
-    RUST_BIN="./deploy/rust/bin"
-    RUST_LIB="./deploy/rust/lib"
+# if [[ $HOST_TRIPLE == *apple-darwin* ]]; then
+#     LLVM_BIN="./deploy/llvm/bin"
+#     RUST_BIN="./deploy/rust/bin"
+#     RUST_LIB="./deploy/rust/lib"
 
-    ../scripts/sign.sh \
-        "$LLVM_BIN/llvm-objdump" \
-        "$LLVM_BIN/llvm-ar" \
-        "$LLVM_BIN/llvm-readobj" \
-        "$LLVM_BIN/llvm-objcopy" \
-        "$RUST_BIN/rustc" \
-        "$RUST_BIN/rustdoc" \
-        "$RUST_BIN/cargo" \
-        "$RUST_LIB/librustc_driver-b4e91886a4c059a0.dylib" \
-        "$RUST_LIB/libstd-6eff127b55c063c2.dylib" \
-        "$RUST_LIB/libtest-090d77c63b6e9f11.dylib"\
-
-fi
+#     ../scripts/sign.sh \
+#         "$LLVM_BIN/llvm-objdump" \
+#         "$LLVM_BIN/llvm-ar" \
+#         "$LLVM_BIN/llvm-readobj" \
+#         "$LLVM_BIN/llvm-objcopy" \
+#         "$RUST_BIN/rustc" \
+#         "$RUST_BIN/rustdoc" \
+#         "$RUST_BIN/cargo" \
+#         "$RUST_LIB/librustc_driver-b4e91886a4c059a0.dylib" \
+#         "$RUST_LIB/libstd-6eff127b55c063c2.dylib" \
+#         "$RUST_LIB/libtest-090d77c63b6e9f11.dylib"\
+# fi
 
 # Check the Rust binaries
 while IFS= read -r f

From f331c7186e2b8437d7b624e414303aed286b0d7c Mon Sep 17 00:00:00 2001
From: Oz <oz@certora.com>
Date: Thu, 28 Nov 2024 15:24:51 +0200
Subject: [PATCH 34/48] restore signing and add rust-lld

---
 scripts/package.sh | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/scripts/package.sh b/scripts/package.sh
index e6b8574..c2707ce 100755
--- a/scripts/package.sh
+++ b/scripts/package.sh
@@ -83,23 +83,24 @@ if [[ "${HOST_TRIPLE}" != "x86_64-pc-windows-msvc" ]] ; then
 fi
 
 # Sign macOS binaries
-# if [[ $HOST_TRIPLE == *apple-darwin* ]]; then
-#     LLVM_BIN="./deploy/llvm/bin"
-#     RUST_BIN="./deploy/rust/bin"
-#     RUST_LIB="./deploy/rust/lib"
+if [[ $HOST_TRIPLE == *apple-darwin* ]]; then
+    LLVM_BIN="./deploy/llvm/bin"
+    RUST_BIN="./deploy/rust/bin"
+    RUST_LIB="./deploy/rust/lib"
+    RUST_LIB_BIN="$RUST_LIB/rustlib/aarch64-apple-darwin/bin"
 
-#     ../scripts/sign.sh \
-#         "$LLVM_BIN/llvm-objdump" \
-#         "$LLVM_BIN/llvm-ar" \
-#         "$LLVM_BIN/llvm-readobj" \
-#         "$LLVM_BIN/llvm-objcopy" \
-#         "$RUST_BIN/rustc" \
-#         "$RUST_BIN/rustdoc" \
-#         "$RUST_BIN/cargo" \
-#         "$RUST_LIB/librustc_driver-b4e91886a4c059a0.dylib" \
-#         "$RUST_LIB/libstd-6eff127b55c063c2.dylib" \
-#         "$RUST_LIB/libtest-090d77c63b6e9f11.dylib"\
-# fi
+    ../scripts/sign.sh \
+        "$LLVM_BIN/llvm-objdump" \
+        "$LLVM_BIN/llvm-ar" \
+        "$LLVM_BIN/llvm-readobj" \
+        "$LLVM_BIN/llvm-objcopy" \
+        "$RUST_BIN/rustc" \
+        "$RUST_BIN/rustdoc" \
+        "$RUST_BIN/cargo" \
+        "$RUST_LIB/librustc_driver-b4e91886a4c059a0.dylib" \
+        "$RUST_LIB/libstd-6eff127b55c063c2.dylib" \
+        "$RUST_LIB_BIN/rust-lld"
+fi
 
 # Check the Rust binaries
 while IFS= read -r f

From bfd494ae2e8edc1800918806e903313a66fd59cb Mon Sep 17 00:00:00 2001
From: Oz <oz@certora.com>
Date: Tue, 3 Dec 2024 13:51:43 +0200
Subject: [PATCH 35/48] don't sign rustc

---
 scripts/package.sh | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/scripts/package.sh b/scripts/package.sh
index c2707ce..c983ee2 100755
--- a/scripts/package.sh
+++ b/scripts/package.sh
@@ -87,19 +87,20 @@ if [[ $HOST_TRIPLE == *apple-darwin* ]]; then
     LLVM_BIN="./deploy/llvm/bin"
     RUST_BIN="./deploy/rust/bin"
     RUST_LIB="./deploy/rust/lib"
-    RUST_LIB_BIN="$RUST_LIB/rustlib/aarch64-apple-darwin/bin"
+    # RUST_LIB_BIN="$RUST_LIB/rustlib/aarch64-apple-darwin/bin"
 
     ../scripts/sign.sh \
         "$LLVM_BIN/llvm-objdump" \
         "$LLVM_BIN/llvm-ar" \
         "$LLVM_BIN/llvm-readobj" \
         "$LLVM_BIN/llvm-objcopy" \
-        "$RUST_BIN/rustc" \
         "$RUST_BIN/rustdoc" \
-        "$RUST_BIN/cargo" \
-        "$RUST_LIB/librustc_driver-b4e91886a4c059a0.dylib" \
-        "$RUST_LIB/libstd-6eff127b55c063c2.dylib" \
-        "$RUST_LIB_BIN/rust-lld"
+        "$RUST_BIN/cargo"
+       # Not signin rustc duo to failed cargo build:
+       # "$RUST_BIN/rustc"
+       # "$RUST_LIB/librustc_driver-b4e91886a4c059a0.dylib"
+       # "$RUST_LIB/libstd-6eff127b55c063c2.dylib"
+       # "$RUST_LIB_BIN/rustd-lld"
 fi
 
 # Check the Rust binaries

From 445ae4ba24b93819b620a9a2c5cc4c555d2d5d57 Mon Sep 17 00:00:00 2001
From: Oz <oz@certora.com>
Date: Tue, 3 Dec 2024 14:31:32 +0200
Subject: [PATCH 36/48] sign other rust bins

---
 scripts/package.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/package.sh b/scripts/package.sh
index c983ee2..8dddb49 100755
--- a/scripts/package.sh
+++ b/scripts/package.sh
@@ -87,7 +87,7 @@ if [[ $HOST_TRIPLE == *apple-darwin* ]]; then
     LLVM_BIN="./deploy/llvm/bin"
     RUST_BIN="./deploy/rust/bin"
     RUST_LIB="./deploy/rust/lib"
-    # RUST_LIB_BIN="$RUST_LIB/rustlib/aarch64-apple-darwin/bin"
+    RUST_LIB_BIN="$RUST_LIB/rustlib/aarch64-apple-darwin/bin"
 
     ../scripts/sign.sh \
         "$LLVM_BIN/llvm-objdump" \
@@ -95,12 +95,12 @@ if [[ $HOST_TRIPLE == *apple-darwin* ]]; then
         "$LLVM_BIN/llvm-readobj" \
         "$LLVM_BIN/llvm-objcopy" \
         "$RUST_BIN/rustdoc" \
-        "$RUST_BIN/cargo"
+        "$RUST_BIN/cargo" \
+        "$RUST_LIB/librustc_driver-b4e91886a4c059a0.dylib" \
+        "$RUST_LIB/libstd-6eff127b55c063c2.dylib" \
+        "$RUST_LIB_BIN/rustd-lld"
        # Not signin rustc duo to failed cargo build:
        # "$RUST_BIN/rustc"
-       # "$RUST_LIB/librustc_driver-b4e91886a4c059a0.dylib"
-       # "$RUST_LIB/libstd-6eff127b55c063c2.dylib"
-       # "$RUST_LIB_BIN/rustd-lld"
 fi
 
 # Check the Rust binaries

From 40d8f2f6e2a18b80da7f7ee4ac58b77e4cba7cc5 Mon Sep 17 00:00:00 2001
From: Oz <oz@certora.com>
Date: Tue, 3 Dec 2024 15:10:30 +0200
Subject: [PATCH 37/48] remove test branch

---
 .github/workflows/main.yml | 1 -
 scripts/package.sh         | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e7c1791..400e67f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -3,7 +3,6 @@ name: Build Tools
 on:
   push:
     branches:
-      - oz/ci # TODO: remove this
       - main
     tags: ['*']
   workflow_dispatch:
diff --git a/scripts/package.sh b/scripts/package.sh
index 8dddb49..37f5724 100755
--- a/scripts/package.sh
+++ b/scripts/package.sh
@@ -99,8 +99,7 @@ if [[ $HOST_TRIPLE == *apple-darwin* ]]; then
         "$RUST_LIB/librustc_driver-b4e91886a4c059a0.dylib" \
         "$RUST_LIB/libstd-6eff127b55c063c2.dylib" \
         "$RUST_LIB_BIN/rustd-lld"
-       # Not signin rustc duo to failed cargo build:
-       # "$RUST_BIN/rustc"
+       # "$RUST_BIN/rustc" # Not signing 'rustc' duo to failing cargo build
 fi
 
 # Check the Rust binaries

From 603d94733910749663b7c486f61ad8e84ba4d01e Mon Sep 17 00:00:00 2001
From: Oz <oz@certora.com>
Date: Tue, 3 Dec 2024 17:36:17 +0200
Subject: [PATCH 38/48] fix rust-lld filename

---
 scripts/package.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/package.sh b/scripts/package.sh
index 37f5724..2f56801 100755
--- a/scripts/package.sh
+++ b/scripts/package.sh
@@ -98,7 +98,7 @@ if [[ $HOST_TRIPLE == *apple-darwin* ]]; then
         "$RUST_BIN/cargo" \
         "$RUST_LIB/librustc_driver-b4e91886a4c059a0.dylib" \
         "$RUST_LIB/libstd-6eff127b55c063c2.dylib" \
-        "$RUST_LIB_BIN/rustd-lld"
+        "$RUST_LIB_BIN/rust-lld"
        # "$RUST_BIN/rustc" # Not signing 'rustc' duo to failing cargo build
 fi
 

From 3e8246fb0a727c8251c85ba364cc7b0c73fed207 Mon Sep 17 00:00:00 2001
From: Oz <oz@certora.com>
Date: Tue, 3 Dec 2024 17:52:16 +0200
Subject: [PATCH 39/48] test build

---
 .github/workflows/main.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 400e67f..f4063d2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - oz/ci
     tags: ['*']
   workflow_dispatch:
 

From 7e86db68cdb7ca93d0bbe69f72189d20d810d46a Mon Sep 17 00:00:00 2001
From: Oz <oz@certora.com>
Date: Tue, 3 Dec 2024 17:52:41 +0200
Subject: [PATCH 40/48] remove test branch

---
 .github/workflows/main.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f4063d2..400e67f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - oz/ci
     tags: ['*']
   workflow_dispatch:
 

From e76ca452d5b377347ea11e40990e348717ff9fe6 Mon Sep 17 00:00:00 2001
From: Oz <oz@certora.com>
Date: Wed, 4 Dec 2024 09:28:55 +0200
Subject: [PATCH 41/48] sign only when running ci and disable signing for now

---
 scripts/package.sh | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/scripts/package.sh b/scripts/package.sh
index 2f56801..abf71e3 100755
--- a/scripts/package.sh
+++ b/scripts/package.sh
@@ -82,25 +82,25 @@ if [[ "${HOST_TRIPLE}" != "x86_64-pc-windows-msvc" ]] ; then
     #cp -R rust/build/${HOST_TRIPLE}/llvm/lib/python* deploy/llvm/lib/
 fi
 
-# Sign macOS binaries
-if [[ $HOST_TRIPLE == *apple-darwin* ]]; then
-    LLVM_BIN="./deploy/llvm/bin"
-    RUST_BIN="./deploy/rust/bin"
-    RUST_LIB="./deploy/rust/lib"
-    RUST_LIB_BIN="$RUST_LIB/rustlib/aarch64-apple-darwin/bin"
+# Sign macOS binaries - Disabled
+# if [[ $HOST_TRIPLE == *apple-darwin* ]] && [[ ! -z "$APPLE_CODESIGN_IDENTITY" ]]; then
+#     LLVM_BIN="./deploy/llvm/bin"
+#     RUST_BIN="./deploy/rust/bin"
+#     RUST_LIB="./deploy/rust/lib"
+#     RUST_LIB_BIN="$RUST_LIB/rustlib/aarch64-apple-darwin/bin"
 
-    ../scripts/sign.sh \
-        "$LLVM_BIN/llvm-objdump" \
-        "$LLVM_BIN/llvm-ar" \
-        "$LLVM_BIN/llvm-readobj" \
-        "$LLVM_BIN/llvm-objcopy" \
-        "$RUST_BIN/rustdoc" \
-        "$RUST_BIN/cargo" \
-        "$RUST_LIB/librustc_driver-b4e91886a4c059a0.dylib" \
-        "$RUST_LIB/libstd-6eff127b55c063c2.dylib" \
-        "$RUST_LIB_BIN/rust-lld"
-       # "$RUST_BIN/rustc" # Not signing 'rustc' duo to failing cargo build
-fi
+#     ../scripts/sign.sh \
+#         "$LLVM_BIN/llvm-objdump" \
+#         "$LLVM_BIN/llvm-ar" \
+#         "$LLVM_BIN/llvm-readobj" \
+#         "$LLVM_BIN/llvm-objcopy" \
+#         "$RUST_BIN/rustdoc" \
+#         "$RUST_BIN/cargo" \
+#         "$RUST_LIB/librustc_driver-b4e91886a4c059a0.dylib" \
+#         "$RUST_LIB/libstd-6eff127b55c063c2.dylib" \
+#         "$RUST_LIB_BIN/rust-lld"
+#        # "$RUST_BIN/rustc" # Not signing 'rustc' duo to failing cargo build
+# fi
 
 # Check the Rust binaries
 while IFS= read -r f

From b37372700a4f031b07f5400fa7b528ed7ce1dee8 Mon Sep 17 00:00:00 2001
From: Oz <oz@certora.com>
Date: Wed, 4 Dec 2024 10:52:38 +0200
Subject: [PATCH 42/48] use cargo 1.75

---
 .github/workflows/main.yml | 11 ++++++++---
 justfile                   |  4 ++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 400e67f..b033417 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - oz/ci
     tags: ['*']
   workflow_dispatch:
 
@@ -15,7 +16,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Install dependencies
-        run: brew install just ninja
+        run: |
+            brew install just ninja
+            rustup install 1.75.0
       - name: Clone
         run: just clone
       - name: Prepare
@@ -44,8 +47,10 @@ jobs:
       - uses: actions/checkout@v4
       - name: Install just
         uses: taiki-e/install-action@just
-      - name: Install ninja
-        run: sudo apt update; sudo apt install ninja-build
+      - name: Install dependencies
+        run: |
+          sudo apt update; sudo apt install ninja-build
+          rustup install 1.75.0
       - name: Clone
         run: just clone
       - name: Prepare
diff --git a/justfile b/justfile
index 28f11d5..2093e84 100644
--- a/justfile
+++ b/justfile
@@ -30,11 +30,11 @@ build-cargo:
 	# AG: this fails for me with macport and libiconv
 	# AG: I have to disable libiconv, run this manually
 	# AG: and then re-enable it
-	cd {{ out_dir }}/cargo && cargo update && env OPENSSL_STATIC=1 cargo build --release
+	cd {{ out_dir }}/cargo && env OPENSSL_STATIC=1 cargo +1.75 build --release
 
 [linux]
 build-cargo:
-	cd {{ out_dir }}/cargo && cargo update && env OPENSSL_STATIC=1 OPENSSL_LIB_DIR=/usr/lib/x86_64-linux-gnu OPENSSL_INCLUDE_DIR=/usr/include/openssl cargo build --release
+	cd {{ out_dir }}/cargo && env OPENSSL_STATIC=1 OPENSSL_LIB_DIR=/usr/lib/x86_64-linux-gnu OPENSSL_INCLUDE_DIR=/usr/include/openssl cargo +1.75 build --release
 
 
 [linux,macos]

From bdfe7835f4ee4a83346ac515792983ed0f0074ff Mon Sep 17 00:00:00 2001
From: Oz <oz@certora.com>
Date: Wed, 4 Dec 2024 11:23:03 +0200
Subject: [PATCH 43/48] add macos intel build

---
 .github/workflows/main.yml | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b033417..ccea5c6 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -9,7 +9,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  build-mac:
+  build-mac-arm:
     runs-on: macos-latest
     env:
       TAG: ${{ github.ref_name }}
@@ -39,6 +39,36 @@ jobs:
           name: platform-tools-osx-aarch64.tar.bz2
           path: out/platform-tools-osx-aarch64.tar.bz2
 
+  build-mac-intel:
+    runs-on: macos-latest-large
+    env:
+      TAG: ${{ github.ref_name }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install dependencies
+        run: |
+            brew install just ninja
+            rustup install 1.75.0
+      - name: Clone
+        run: just clone
+      - name: Prepare
+        run: just prepare
+      - name: Build rust, cargo and newlib
+        run: just build-all
+      - name: Package
+        env:
+          APPLE_CODESIGN_IDENTITY: ${{ secrets.APPLE_CODESIGN_IDENTITY }}
+          APPLE_CRED: ${{ secrets.APPLE_CRED }}
+          APPLE_P12_BASE64: ${{ secrets.APPLE_P12_BASE64 }}
+          APPLE_P12_PASSWORD: ${{ secrets.APPLE_P12_PASSWORD }}
+          APPLE_TEAMID: ${{ secrets.APPLE_TEAMID }}
+          APPLE_TEMPKEYCHAIN_PASSWORD: ${{ secrets.APPLE_TEMPKEYCHAIN_PASSWORD }}
+        run: just package
+      - uses: actions/upload-artifact@v4
+        with:
+          name: platform-tools-osx-x86_64.tar.bz2
+          path: out/platform-tools-osx-x86_64.tar.bz2
+
   build-linux:
     runs-on: ubuntu-latest
     env:

From bfd15df696e03c7d7a6498be50c78113b79703f1 Mon Sep 17 00:00:00 2001
From: Oz <oz@certora.com>
Date: Wed, 4 Dec 2024 11:26:10 +0200
Subject: [PATCH 44/48] add mac intel to release

---
 .github/workflows/main.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ccea5c6..3f94d3c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -96,7 +96,7 @@ jobs:
 
   release:
     runs-on: ubuntu-latest
-    needs: [build-linux, build-mac]
+    needs: [build-linux, build-mac-arm, build-mac-intel]
     if: startsWith(github.event.ref, 'refs/tags/') #  only on new tag creation
     env:
       TAG: ${{ github.ref_name }}
@@ -111,8 +111,10 @@ jobs:
           release_exist=$(gh release view $TAG 2>&1 || exit 0)
           if [ "$release_exist" = "release not found" ]; then
             gh release create $TAG platform-tools-osx-aarch64.tar.bz2/platform-tools-osx-aarch64.tar.bz2 --title "Release $TAG" --generate-notes --latest
+            gh release upload $TAG platform-tools-osx-x86_64.tar.bz2/platform-tools-osx-x86_64.tar.bz2
             gh release upload $TAG platform-tools-linux-x86_64.tar.bz2/platform-tools-linux-x86_64.tar.bz2
           else
             gh release upload $TAG platform-tools-osx-aarch64.tar.bz2/platform-tools-osx-aarch64.tar.bz2
+            gh release upload $TAG platform-tools-osx-x86_64.tar.bz2/platform-tools-osx-x86_64.tar.bz2
             gh release upload $TAG platform-tools-linux-x86_64.tar.bz2/platform-tools-linux-x86_64.tar.bz2
           fi

From cf7001329b75a30e629487f472627767c763d015 Mon Sep 17 00:00:00 2001
From: Oz <oz@certora.com>
Date: Wed, 4 Dec 2024 13:25:01 +0200
Subject: [PATCH 45/48] add toolchain for v1.75

---
 .github/workflows/main.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3f94d3c..2cfb1bd 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -19,6 +19,7 @@ jobs:
         run: |
             brew install just ninja
             rustup install 1.75.0
+            rustup toolchain install 1.75.0
       - name: Clone
         run: just clone
       - name: Prepare
@@ -49,6 +50,7 @@ jobs:
         run: |
             brew install just ninja
             rustup install 1.75.0
+            rustup toolchain install 1.75.0
       - name: Clone
         run: just clone
       - name: Prepare
@@ -81,6 +83,7 @@ jobs:
         run: |
           sudo apt update; sudo apt install ninja-build
           rustup install 1.75.0
+          rustup toolchain install 1.75.0
       - name: Clone
         run: just clone
       - name: Prepare

From 213a8cfb565175e467772f87115bb53e6a1eb74c Mon Sep 17 00:00:00 2001
From: Oz <oz@certora.com>
Date: Wed, 4 Dec 2024 15:47:22 +0200
Subject: [PATCH 46/48] cahnge default toolchain

---
 .github/workflows/main.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2cfb1bd..20a189c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -20,6 +20,7 @@ jobs:
             brew install just ninja
             rustup install 1.75.0
             rustup toolchain install 1.75.0
+            rustup default 1.75.0-aarch64-apple-darwin
       - name: Clone
         run: just clone
       - name: Prepare
@@ -51,6 +52,7 @@ jobs:
             brew install just ninja
             rustup install 1.75.0
             rustup toolchain install 1.75.0
+            rustup default 1.75.0-aarch64-apple-darwin
       - name: Clone
         run: just clone
       - name: Prepare
@@ -84,6 +86,7 @@ jobs:
           sudo apt update; sudo apt install ninja-build
           rustup install 1.75.0
           rustup toolchain install 1.75.0
+          rustup default 1.75.0-aarch64-apple-darwin
       - name: Clone
         run: just clone
       - name: Prepare

From ddf9b243c58652aaf8277a84c550bb334543304c Mon Sep 17 00:00:00 2001
From: Oz <oz@certora.com>
Date: Wed, 4 Dec 2024 17:46:40 +0200
Subject: [PATCH 47/48] use version 1.75 and fix default toolchain

---
 .github/workflows/main.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 20a189c..a9b44b4 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -18,9 +18,9 @@ jobs:
       - name: Install dependencies
         run: |
             brew install just ninja
-            rustup install 1.75.0
-            rustup toolchain install 1.75.0
-            rustup default 1.75.0-aarch64-apple-darwin
+            rustup install 1.75
+            rustup toolchain install 1.75
+            rustup default 1.75-aarch64-apple-darwin
       - name: Clone
         run: just clone
       - name: Prepare
@@ -50,9 +50,9 @@ jobs:
       - name: Install dependencies
         run: |
             brew install just ninja
-            rustup install 1.75.0
-            rustup toolchain install 1.75.0
-            rustup default 1.75.0-aarch64-apple-darwin
+            rustup install 1.75
+            rustup toolchain install 1.75
+            rustup default 1.75-x86_64-apple-darwin
       - name: Clone
         run: just clone
       - name: Prepare
@@ -84,9 +84,9 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt update; sudo apt install ninja-build
-          rustup install 1.75.0
-          rustup toolchain install 1.75.0
-          rustup default 1.75.0-aarch64-apple-darwin
+          rustup install 1.75
+          rustup toolchain install 1.75
+          rustup default 1.75-x86_64-unknown-linux-gnu
       - name: Clone
         run: just clone
       - name: Prepare

From 993c1ff2513638d6eba0c30aa8a20dfd11174db1 Mon Sep 17 00:00:00 2001
From: Oz <oz@certora.com>
Date: Thu, 5 Dec 2024 21:20:11 +0200
Subject: [PATCH 48/48] use macos-13 for intel

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a9b44b4..fdce68b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -42,7 +42,7 @@ jobs:
           path: out/platform-tools-osx-aarch64.tar.bz2
 
   build-mac-intel:
-    runs-on: macos-latest-large
+    runs-on: macos-13
     env:
       TAG: ${{ github.ref_name }}
     steps: