fix build versioning (#19)

* clean up from static builds * fix build versioning * include git history * debugging git * debugging git * debugging git * debugging git * debugging git * debugging git * debugging git
flashbots · Nov 12, 2024 · 9eca4ba · 9eca4ba
1 parent f7dcf06
commit 9eca4ba
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 15 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -65,24 +65,29 @@ jobs:
             runner: warp-ubuntu-latest-x64-16x
 
     steps:
-      - uses: actions/checkout@v4
-
       - uses: WarpBuilds/rust-cache@v2
 
-      - name: Prepare filename
-        run: echo "OUTPUT_FILENAME=rbuilder-${VERSION}-${{ matrix.configs.target }}" >> $GITHUB_ENV
-
-      - name: Build binary
+      - name: Install dependencies
         run: |
           apt-get update
           apt-get install -y \
             build-essential \
             curl \
+            git \
             libclang-dev \
             libssl-dev \
             pkg-config \
             protobuf-compiler
           curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+
+      - uses: actions/checkout@v4 # must install git before checkout and set safe.directory after checkout because of container
+
+      - name: Prepare filename
+        run: echo "OUTPUT_FILENAME=rbuilder-${VERSION}-${{ matrix.configs.target }}" >> $GITHUB_ENV
+
+      - name: Build binary
+        run: |
+          git config --global --add safe.directory "$(pwd)"
           . $HOME/.cargo/env
           cargo build --release --target ${{ matrix.configs.target }}
 

diff --git a/Cargo.toml b/Cargo.toml
@@ -4,7 +4,6 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-openssl = { version = "0.10", features = ["vendored"], optional = false }
 clap = { version = "4.4.3", features = ["derive", "env"] }
 tokio = "1.32.0"
 tokio-util = "0.7.10"

diff --git a/Cross.toml b/Cross.toml
diff --git a/Makefile b/Makefile
@@ -23,7 +23,7 @@ clean: ## Clean up
 
 .PHONY: build
 build: ## Build static binary for x86_64
-	cross build --release --target x86_64-unknown-linux-musl
+	cargo build --release --target x86_64-unknown-linux-gnu
 
 .PHONY: docker-image
 docker-image: ## Build a rbuilder Docker image