AI/rocm-systems
2
0
Vork 0
Code Kwesties Pull-aanvragen Actions Paketten Projecten Publicaties Wiki Activiteit

build-docker.sh: CI -> BUILD_CI (#63)

Bladeren bron 
- docker run fix (remove -it argument)

[ROCm/rocprofiler-systems commit: 919dcf5456]
This commit is contained in:
Jonathan R. Madsen
2022-05-19 21:16:20 -05:00
gecommit door GitHub
bovenliggende 048d7cb856
commit feb2b45c0d
4 gewijzigde bestanden met toevoegingen van 3 en 23 verwijderingen
Download Patch-bestand Download Diff-bestand Expand all files Collapse all files
projects/rocprofiler-systems/.github/workflows/cpack-opensuse.yml
Vendored
-10
Bestand weergeven
@@ -20,16 +20,6 @@ jobs:
extensions: ["--rocm +python", "--core +python"]
steps:
- name: Patch Git
timeout-minutes: 5
run: |
apt-get update
apt-get install -y software-properties-common
add-apt-repository -y ppa:git-core/ppa
apt-get update
apt-get upgrade -y
apt-get install -y git
- uses: actions/checkout@v3
with:
submodules: recursive
projects/rocprofiler-systems/.github/workflows/cpack-ubuntu.yml
Vendored
-10
Bestand weergeven
@@ -20,16 +20,6 @@ jobs:
extensions: ["--rocm +python", "--core +python"]
steps:
- name: Patch Git
timeout-minutes: 5
run: |
apt-get update
apt-get install -y software-properties-common
add-apt-repository -y ppa:git-core/ppa
apt-get update
apt-get upgrade -y
apt-get install -y git
- uses: actions/checkout@v3
with:
submodules: recursive
projects/rocprofiler-systems/docker/build-docker-release.sh
+1 -1
Bestand weergeven
@@ -33,7 +33,7 @@ build-release()
shift
shift
shift
verbose-run docker run -it --rm -v ${PWD}:/home/omnitrace --env DISTRO=${OS} --env ROCM_VERSION=${ROCM_VERSION} --env VERSION=${CODE_VERSION} --env PYTHON_VERSIONS=\"${PYTHON_VERSIONS}\" ${CONTAINER} /home/omnitrace/scripts/build-release.sh ${@}
verbose-run docker run --rm -v ${PWD}:/home/omnitrace --env DISTRO=${OS} --env ROCM_VERSION=${ROCM_VERSION} --env VERSION=${CODE_VERSION} --env PYTHON_VERSIONS=\"${PYTHON_VERSIONS}\" ${CONTAINER} /home/omnitrace/scripts/build-release.sh ${@}
}
: ${DISTRO:=ubuntu}
projects/rocprofiler-systems/docker/build-docker.sh
+2 -2
Bestand weergeven
@@ -4,7 +4,7 @@
: ${DISTRO:=ubuntu}
: ${VERSIONS:=20.04 18.04}
: ${PYTHON_VERSIONS:="6 7 8 9 10"}
: ${CI:=""}
: ${BUILD_CI:=""}
set -e
@@ -58,7 +58,7 @@ done
DOCKER_FILE="Dockerfile.${DISTRO}"
if [ -n "${CI}" ]; then DOCKER_FILE="${DOCKER_FILE}.ci"; fi
if [ -n "${BUILD_CI}" ]; then DOCKER_FILE="${DOCKER_FILE}.ci"; fi
if [ ! -f ${DOCKER_FILE} ]; then cd docker; fi
if [ ! -f ${DOCKER_FILE} ]; then send-error "File \"${DOCKER_FILE}\" not found"; fi