Merge pull request #9 from protocolbuffers/protoc_static

Update cross-compile action to use protoc_static
protocolbuffers · Mar 4, 2023 · 86a2a6e · 86a2a6e
2 parents ba908c4 + e0cacbb
commit 86a2a6e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/bazel-docker/action.yml b/bazel-docker/action.yml
@@ -21,7 +21,7 @@ inputs:
     type: string
   image:
     required: false
-    default: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:5.1.1-aec4d74f2eb6938fc53ef7d9a79a4bf2da24abc1
+    default: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:5.1.1-6361b3a6e5c97e9951d03a4de28542fc45f1adab
     description: "The docker image to use"
     type: string
   bazel-cache:

diff --git a/cross-compile-protoc/action.yml b/cross-compile-protoc/action.yml
@@ -25,7 +25,7 @@ inputs:
     type: string
   image:
     required: false
-    default: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:5.1.1-aec4d74f2eb6938fc53ef7d9a79a4bf2da24abc1
+    default: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:5.1.1-6361b3a6e5c97e9951d03a4de28542fc45f1adab
     description: "The docker image to use"
     type: string
 outputs:
@@ -50,8 +50,8 @@ runs:
         image: ${{ inputs.image }}
         bazel-cache: xcompile-protoc/${{ inputs.architecture }}
         bash: |
-          bazel build //:protoc --config=${{ inputs.architecture }} $BAZEL_FLAGS
-          cp bazel-bin/protoc .
+          bazel build //:protoc_static --config=${{ inputs.architecture }} $BAZEL_FLAGS
+          cp bazel-bin/protoc_static .
 
     - name: Set protoc environment variable
       shell: bash
@@ -61,5 +61,5 @@ runs:
       id: output
       shell: bash
       run: |
-        mv protoc $PROTOC
+        mv protoc_static $PROTOC
         echo "protoc=$PROTOC" >> $GITHUB_OUTPUT
diff --git a/docker/action.yml b/docker/action.yml
@@ -24,7 +24,7 @@ inputs:
     description: A command to run in the docker image
   image:
     required: false
-    default: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:5.1.1-aec4d74f2eb6938fc53ef7d9a79a4bf2da24abc1
+    default: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:5.1.1-6361b3a6e5c97e9951d03a4de28542fc45f1adab
     description: "The docker image to use"
     type: string
   platform:
@@ -35,6 +35,10 @@ inputs:
     required: false
     description: "Skip staleness checks"
     type: boolean
+  entrypoint:
+    required: false
+    description: "Specify a custom entrypoint for docker"
+    type: string
 
 runs:
   using: 'composite'
@@ -58,10 +62,15 @@ runs:
         bazel-cache: regenerate-stale-files
         bash: ./regenerate_stale_files.sh $BAZEL_FLAGS
 
-    - name: Generate docker flags
+    - name: Generate docker platform flags
       if: inputs.platform
       shell: bash
-      run: echo "DOCKER_RUN_FLAGS=--platform ${{inputs.platform}}" >> $GITHUB_ENV
+      run: echo "DOCKER_RUN_FLAGS=--platform ${{inputs.platform}} $DOCKER_RUN_FLAGS" >> $GITHUB_ENV
+
+    - name: Generate docker entrypoing flags
+      if: inputs.entrypoint
+      shell: bash
+      run: echo "DOCKER_RUN_FLAGS=--entrypoint ${{inputs.entrypoint}} $DOCKER_RUN_FLAGS " >> $GITHUB_ENV
 
     - name: Run Docker
       uses: ./../../_actions/current/internal/docker-run