Remove branch specific

simdsoft · Jan 11, 2022 · d3e4bbc · d3e4bbc
1 parent f89f9ac
commit d3e4bbc
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/.github/workflows/build-ci.yml b/.github/workflows/build-ci.yml
@@ -1,14 +1,13 @@
 #
-# Copyright (c) 2021 Bytedance Inc. @1
+# Copyright (c) 2021-2022 Bytedance Inc. @2022_1
 #
 
 name: build-ci
 
 # Controls when the action will run. 
 on:
-  # Triggers the workflow on push or pull request events but only for the main branch
+  # Triggers the workflow on push or pull request events
   push:
-    branches: [ main ]
     paths:
       - .github/workflows/build-ci.yml
       - 1k/build*

diff --git a/.github/workflows/dist-ci.yml b/.github/workflows/dist-ci.yml
@@ -72,8 +72,8 @@ jobs:
         # pr: ${{github.event.pull_request.number}}
         # Optional, no need to specify if PR is
         # commit: ${{github.event.pull_request.head.sha}}
-        # Optional, will use the branch
-        branch: main
+        # Optional, will use the action trigger branch
+        # branch: main
         # Optional, defaults to all types
         # event: push
         # Optional, if not specified, the artifact from the most recent successfully completed workflow run will be downloaded

diff --git a/1k/build.sh b/1k/build.sh
@@ -57,9 +57,9 @@ if [ "$BUILD_TARGET" = "android" ] ; then
 fi
 
 # Build libs
-source 1k/build1.sh jpeg-turbo $BUILD_TARGET $BUILD_ARCH $INSTALL_ROOT
 source 1k/build1.sh openssl $BUILD_TARGET $BUILD_ARCH $INSTALL_ROOT
 source 1k/build1.sh curl $BUILD_TARGET $BUILD_ARCH $INSTALL_ROOT
+source 1k/build1.sh jpeg-turbo $BUILD_TARGET $BUILD_ARCH $INSTALL_ROOT
 source 1k/build1.sh luajit $BUILD_TARGET $BUILD_ARCH $INSTALL_ROOT
 
 # Export INSTALL_ROOT for uploading

diff --git a/1k/build1.sh b/1k/build1.sh
@@ -219,7 +219,7 @@ if [ "$cb_tool" = "cmake" ] ; then
         CONFIG_ALL_OPTIONS="$CONFIG_ALL_OPTIONS -DOPENSSL_INCLUDE_DIR=${openssl_dir}include -DOPENSSL_LIB_DIR=${openssl_dir}lib"
     fi
     echo CONFIG_ALL_OPTIONS="$CONFIG_ALL_OPTIONS"
-    cmake -S . -B build_$BUILD_ARCH $CONFIG_ALL_OPTIONS
+    cmake "-DCMAKE_C_FLAGS=-fPIC" -S . -B build_$BUILD_ARCH $CONFIG_ALL_OPTIONS
     cmake --build build_$BUILD_ARCH --config Release
     cmake --install build_$BUILD_ARCH
 elif [ "$cb_tool" = "perl" ] ; then # openssl TODO: move to custom build.sh