Activate hbb in same step as cmake is run.

tmaklin · Jun 6, 2024 · a2813df · a2813df
1 parent 2c191bc
commit a2813df
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/.github/workflows/make_release.yml b/.github/workflows/make_release.yml
@@ -11,19 +11,11 @@ jobs:
     runs-on: ubuntu-latest
     container: phusion/holy-build-box-64:3.0.2
     steps:
-      - name: Activate Holy Build Box
-        id: activate-hbb
-        run: |
-          source /hbb_exe/activate
-          export LDFLAGS="-L/lib64 -static-libstdc++"
-
       - name: Install dependencies
         id: install-dependencies
         shell: bash
         run: |
           yum install -y git
-          rm --force /hbb/bin/git
-          ln -s /usr/bin/git /hbb/bin/git
 
       - name: Create io directories
         id: mkdir-io
@@ -43,13 +35,22 @@ jobs:
       - name: Configure source build
         id: run-cmake
         run: |
+          source /hbb_exe/activate
+          export LDFLAGS="-L/lib64 -static-libstdc++"
+          rm --force /hbb/bin/git
+          ln -s /usr/bin/git /hbb/bin/git
           mkdir build
           cd build
           cmake -DCMAKE_CXX_FLAGS="-march=x86-64 -mtune=generic -m64" -DCMAKE_C_FLAGS="-march=x86-64 -mtune=generic -m64" -DCMAKE_WITH_FLTO=1 -DCMAKE_WITH_NATIVE_INSTRUCTIONS=OFF ..
 
       - name: Compile Linux x86_64 binary
         id: run-make
-        run: make VERBOSE=1 -j
+        run: |
+          source /hbb_exe/activate
+          export LDFLAGS="-L/lib64 -static-libstdc++"
+          rm --force /hbb/bin/git
+          ln -s /usr/bin/git /hbb/bin/git
+          make VERBOSE=1 -j
 
       - name: Create distributable archive
         id: gather-stuff