From 136aee5a51f2619763851b0ce19c8e5ae2083204 Mon Sep 17 00:00:00 2001 From: Haotian Zhang <928016560@qq.com> Date: Fri, 21 Jun 2024 11:57:30 +0800 Subject: [PATCH] feat:update GitHub Action. --- .github/workflows/docker.yml | 2 +- .github/workflows/example.yml | 2 +- polaris-agent-build/bin/build_docker.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index c08b70ef..2accd4a7 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -54,6 +54,6 @@ jobs: id: build run: | export use_docker_env=false - pushd polaris-agent-build/bin + cd polaris-agent-build/bin bash ./build_docker.sh ${{ steps.get_version.outputs.VERSION }} diff --git a/.github/workflows/example.yml b/.github/workflows/example.yml index 5f1e5675..3af83c09 100644 --- a/.github/workflows/example.yml +++ b/.github/workflows/example.yml @@ -57,7 +57,7 @@ jobs: id: build run: | export use_docker_env=false - pushd polaris-agent-build/bin + cd polaris-agent-build/bin bash ./build.sh bash ./build_example_docker.sh ${{ github.event.inputs.subdir }} diff --git a/polaris-agent-build/bin/build_docker.sh b/polaris-agent-build/bin/build_docker.sh index 1f9d60f4..76000ce8 100644 --- a/polaris-agent-build/bin/build_docker.sh +++ b/polaris-agent-build/bin/build_docker.sh @@ -8,7 +8,7 @@ set -e version=$(xmllint --xpath "//*[local-name()='project']/*[local-name()='properties']/*[local-name()='revision']/text()" ../../pom.xml) echo "${version}" > version.txt -sh ./build.sh +bash ./build.sh docker_tag=$1 @@ -36,4 +36,4 @@ if [ ${pre_release} == 0 ]; then extra_tags="-t ${docker_repository}/polaris-javaagent-init:latest" fi -docker buildx build -f ./Dockerfile -t ${docker_repository}/polaris-javaagent-init:${docker_tag} --build-arg version=${version} ${extra_tags} --platform ${platforms} --push ./ \ No newline at end of file +#docker buildx build -f ./Dockerfile -t ${docker_repository}/polaris-javaagent-init:${docker_tag} --build-arg version=${version} ${extra_tags} --platform ${platforms} --push ./ \ No newline at end of file