From 555577f206238df4ddaaf2919430d9d55e03fe8e Mon Sep 17 00:00:00 2001 From: "young.yang03" Date: Thu, 5 Jan 2023 15:58:53 +0800 Subject: [PATCH 1/5] Cloud mta build tool document update (#1024) * modified: docs/docs/index.md * modified: docs/docs/index.md * modified: docs/docs/index.md * modified: docs/docs/index.md * modified: docs/docs/index.md * modified: docs/docs/index.md * modified: docs/docs/index.md * modified: docs/docs/index.md Co-authored-by: Young Yang --- docs/docs/index.md | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/docs/docs/index.md b/docs/docs/index.md index aa64bbe92..4d2f2d481 100644 --- a/docs/docs/index.md +++ b/docs/docs/index.md @@ -30,6 +30,13 @@ If the MTA Build Tool encounters a module type in the `mta.yaml` file that is no All resource definitions are passed to the `mtad.yaml` file as is without mapping and validations (for example, if the resource is supported in the target platform or if the specified parameters match the type). -### Creating an MTA Archive According to the MTA Deploymnet Descriptor (`mtad.yaml` file) +### Creating an MTA Archive According to the MTA Deployment Descriptor (`mtad.yaml` file) + +The function is provided to assemble multiple modules, which are developed and prebuilt as separate projects, into one MTAR for deployment. The function is implemented by the `mbt assemble` command, which copies all modules, module required dependencies, module build artifacts, and resource definitions into an MTAR, according to the MTA Deployment Descriptor (mtad.yaml file). + +If a module doesn’t have the `path` attribute, the assemble process skips it. If a module has the `path` attribute, but its value is invalid, the assemble process fails with the following error: `ERROR could not copy MTA artifacts to assemble: the "" path does not exist in the MTA project location`. + +If a required dependency or resource doesn’t have the `parameters.path` attribute, the assemble process skips it. If a required dependency or resource has the `parameters.path` attribute, but its value is invalid, the assemble process fails with the following error: `ERROR could not copy MTA artifacts to assemble: the "" path does not exist in the MTA project location`. + +For more details about how to use the MBT assemble command, see [How to build an MTA archive from the modules' build artifacts](https://github.com/SAP/cloud-mta-build-tool/blob/master/docs/docs/usage.md#how-to-build-an-mta-archive-from-the-modules-build-artifacts). -Under construction From 7cf79793dfde093eaf874179f24df3a2c62eb885 Mon Sep 17 00:00:00 2001 From: "young.yang03" Date: Tue, 7 Feb 2023 18:07:28 +0800 Subject: [PATCH 2/5] MBT Java 8 Docker Image (#1023) * modified: Dockerfile_mbtci_template modified: cmd/testdata/mtahtml5/mta.sh modified: integration/testdata/mtahtml5/mta.sh modified: scripts/build_image modified: scripts/common_image * modified: .circleci/config.yml * modified: Dockerfile_mbtci_template * modified: Dockerfile_mbtci_template * modified: Dockerfile_mbtci_template modified: test/goss/goss_template.yaml --------- Co-authored-by: Young Yang --- .circleci/config.yml | 129 ++++++++++++++++++++++++++- Dockerfile_mbtci_template | 90 +++++++++++++------ cmd/testdata/mtahtml5/mta.sh | 2 +- integration/testdata/mtahtml5/mta.sh | 2 +- scripts/build_image | 3 +- scripts/common_image | 2 +- test/goss/goss_template.yaml | 17 +++- 7 files changed, 209 insertions(+), 36 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b5ec4b72a..b3d8c191d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -52,7 +52,7 @@ jobs: command: | go mod vendor - run: cf login -a $CF_API -o $ORG -s $SPACE -u $TECH_USER -p $TECH_PASS - - run: cd integration && go test -tags=integration + - run: cd integration && go test -tags=integration compliance: docker: @@ -139,6 +139,102 @@ jobs: export GITHUB_TOKEN=${CLOUD_MTA_BOT_GITHUB_TOKEN} curl -sfL https://goreleaser.com/static/run | bash + publish-to-dockerhub-java8-node14: + docker: + - image: cimg/go:1.17 + working_directory: ~/go/src/github.com/young-yang03/cloud-mta-build-tool + steps: + - checkout + - setup_remote_docker: + version: 20.10.6 + - run: + name: build image pre-setup + command: | + #Make sure HEAD points to master + git checkout master + git fetch + git rebase + - run: + name: build Java 8.1.091 & Node 14.21.1 image + command: | + MBT_VERSION=$(cat ./VERSION) + sh $PWD/scripts/build_image 8.1.091 14.21.1 ${MBT_VERSION} + - run: + name: publish Java 8.1.091 & Node 14.21.1 image + command: | + MBT_VERSION=$(cat ./VERSION) + echo "Image release: ${MBT_VERSION}" + #Push to Docker Hub + echo "$DOCKER_HUB_TOKEN" | docker login --username $DOCKER_HUB_USER --password-stdin + sh $PWD/scripts/publish_image 8.1.091 14.21.1 ${MBT_VERSION} "cobra217" + #Push to GitHub Container Registry + echo "$CLOUD_MTA_BOT_GITHUB_TOKEN" | docker login "ghcr.io" --username $CLOUD_MTA_BOT_USER --password-stdin + sh $PWD/scripts/publish_image 8.1.091 14.21.1 ${MBT_VERSION} "ghcr.io/young-yang03" + + publish-to-dockerhub-java8-node16: + docker: + - image: cimg/go:1.17 + working_directory: ~/go/src/github.com/SAP/cloud-mta-build-tool + steps: + - checkout + - setup_remote_docker: + version: 20.10.6 + - run: + name: build image pre-setup + command: | + #Make sure HEAD points to master + git checkout master + git fetch + git rebase + - run: + name: build Java 8.1.091 & Node 16.18.1 image + command: | + MBT_VERSION=$(cat ./VERSION) + sh $PWD/scripts/build_image 8.1.091 16.18.1 ${MBT_VERSION} + - run: + name: publish Java 8.1.091 & Node 16.18.1 image + command: | + MBT_VERSION=$(cat ./VERSION) + echo "Image release: ${MBT_VERSION}" + #Push to Docker Hub + echo "$DOCKER_HUB_TOKEN" | docker login --username $DOCKER_HUB_USER --password-stdin + sh $PWD/scripts/publish_image 8.1.091 16.18.1 ${MBT_VERSION} "cobra217" + #Push to GitHub Container Registry + echo "$CLOUD_MTA_BOT_GITHUB_TOKEN" | docker login "ghcr.io" --username $CLOUD_MTA_BOT_USER --password-stdin + sh $PWD/scripts/publish_image 8.1.091 16.18.1 ${MBT_VERSION} "ghcr.io/young-yang03" + + publish-to-dockerhub-java8-node18: + docker: + - image: cimg/go:1.17 + working_directory: ~/go/src/github.com/SAP/cloud-mta-build-tool + steps: + - checkout + - setup_remote_docker: + version: 20.10.6 + - run: + name: build image pre-setup + command: | + #Make sure HEAD points to master + git checkout master + git fetch + git rebase + - run: + name: build Java 8.1.091 & Node 18.12.1 image + command: | + MBT_VERSION=$(cat ./VERSION) + sh $PWD/scripts/build_image 8.1.091 18.12.1 ${MBT_VERSION} + - run: + name: publish Java 8.1.091 & Node 18.12.1 image + command: | + MBT_VERSION=$(cat ./VERSION) + echo "Image release: ${MBT_VERSION}" + #Push to Docker Hub + echo "$DOCKER_HUB_TOKEN" | docker login --username $DOCKER_HUB_USER --password-stdin + sh $PWD/scripts/publish_image 8.1.091 18.12.1 ${MBT_VERSION} "cobra217" + #Push to GitHub Container Registry + echo "$CLOUD_MTA_BOT_GITHUB_TOKEN" | docker login "ghcr.io" --username $CLOUD_MTA_BOT_USER --password-stdin + sh $PWD/scripts/publish_image 8.1.091 18.12.1 ${MBT_VERSION} "ghcr.io/young-yang03" + publish-to-dockerhub-java11-node14: docker: - image: cimg/go:1.17 @@ -157,8 +253,8 @@ jobs: - run: name: build Java 11.0.17 & Node 14.21.1 image command: | - MBT_VERSION=$(cat ./VERSION) - sh $PWD/scripts/build_image 11.0.17 14.21.1 ${MBT_VERSION} + MBT_VERSION=$(cat ./VERSION) + sh $PWD/scripts/build_image 11.0.17 14.21.1 ${MBT_VERSION} - run: name: publish Java 11.0.17 & Node 14.21.1 image command: | @@ -553,6 +649,30 @@ workflows: only: /release/ branches: ignore: /.*/ + - publish-to-dockerhub-java8-node14: + requires: + - publish-to-npm + filters: + tags: + only: /release/ + branches: + ignore: /.*/ + - publish-to-dockerhub-java8-node16: + requires: + - publish-to-npm + filters: + tags: + only: /release/ + branches: + ignore: /.*/ + - publish-to-dockerhub-java8-node18: + requires: + - publish-to-npm + filters: + tags: + only: /release/ + branches: + ignore: /.*/ - publish-to-dockerhub-java11-node14: requires: - publish-to-npm @@ -627,6 +747,9 @@ workflows: ignore: /.*/ - remove-github-release-tag: requires: + - publish-to-dockerhub-java8-node14 + - publish-to-dockerhub-java8-node16 + - publish-to-dockerhub-java8-node18 - publish-to-dockerhub-java11-node14 - publish-to-dockerhub-java11-node16 - publish-to-dockerhub-java11-node18 diff --git a/Dockerfile_mbtci_template b/Dockerfile_mbtci_template index 70892f27b..08a87c77a 100644 --- a/Dockerfile_mbtci_template +++ b/Dockerfile_mbtci_template @@ -6,12 +6,13 @@ ARG MTA_USER_HOME="/home/${MTA_USER}" ARG MBT_VERSION=1.2.21 ARG GO_VERSION=1.19.3 ARG NODE_VERSION=NODE_VERSION_TEMPLATE -ARG MAVEN_VERSION=3.8.6 +ARG MAVEN_VERSION=3.8.7 ARG MAVEN_BASE_URL=https://downloads.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries ARG SAPMACHINE_VERSION=JAVA_VERSION_TEMPLATE # Environment variables ENV PYTHON /usr/bin/python3 +ENV JAVA_HOME /opt/jdk ENV MAVEN_HOME /usr/share/maven ENV M2_HOME ${MAVEN_HOME} ENV PATH /usr/local/go/bin:$PATH @@ -72,12 +73,12 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys "$key" ; \ done \ - && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && curl -fsSLO --compressed "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-${ARCH}.tar.xz" \ + && curl -fsSLO --compressed "https://nodejs.org/dist/v${NODE_VERSION}/SHASUMS256.txt.asc" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm -rf "$GNUPGHOME" "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && grep " node-v${NODE_VERSION}-linux-${ARCH}.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v${NODE_VERSION}-linux-${ARCH}.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm -rf "$GNUPGHOME" "node-v${NODE_VERSION}-linux-${ARCH}.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && apt-mark auto '.*' > /dev/null \ && find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { print $(NF-1) }' \ @@ -143,31 +144,59 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && go version # Install SAPMachine -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ +RUN sapmachine_install() { \ + SAPMACHINE_MAJOR_VERSION=$(echo ${SAPMACHINE_VERSION} | cut -d. -f1); \ + ARCH=; \ + dpkgArch="$(dpkg --print-architecture)"; \ + case "${dpkgArch##*-}" in \ amd64) ARCH='amd64';; \ *) echo "unsupported architecture"; exit 1 ;; \ - esac \ + esac; \ + apt-get update; \ + apt-get install -y ca-certificates gnupg dirmngr --no-install-recommends; \ + rm -rf /var/lib/apt/lists/*; \ + export GNUPGHOME="$(mktemp -d)"; \ + for key in \ + CACB9FE09150307D1D22D82962754C3B3ABCFE23 \ + ; do \ + gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys "$key" ; \ + done; \ + chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg; \ + echo "deb http://dist.sapmachine.io/debian/${ARCH}/ ./" | tee /etc/apt/sources.list.d/sapmachine.list; \ + apt-get update; \ + apt-get install -y sapmachine-${SAPMACHINE_MAJOR_VERSION}-jdk=${SAPMACHINE_VERSION} --no-install-recommends; \ + rm -rf "$GNUPGHOME" /var/lib/apt/lists/*; \ + apt-get remove --purge --autoremove -y ca-certificates gnupg dirmngr; \ + ln -s /usr/lib/jvm/sapmachine-${SAPMACHINE_MAJOR_VERSION} ${JAVA_HOME}; \ + }; \ + sapjvm_install() { \ + ARCH=; \ + dpkgArch="$(dpkg --print-architecture)"; \ + case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac; \ + apt-get update; \ + apt-get install -y ca-certificates curl libarchive-tools --no-install-recommends; \ + rm -rf /var/lib/apt/lists/*; \ + curl -fsSLO --compressed -b 'eula_3_1_agreed=tools.hana.ondemand.com/developer-license-3_1.txt' https://tools.hana.ondemand.com/additional/sapjvm-${SAPMACHINE_VERSION}-linux-${ARCH}.zip; \ + echo "583dedfeee0c119839a610ddc8c6768d0c044429 sapjvm-${SAPMACHINE_VERSION}-linux-${ARCH}.zip" | sha1sum -c -; \ + bsdtar -xvf sapjvm-${SAPMACHINE_VERSION}-linux-${ARCH}.zip -C /usr/local --strip-components=1 --no-same-owner; \ + rm -f sapjvm-${SAPMACHINE_VERSION}-linux-${ARCH}.zip; \ + apt-get remove --purge --auto-remove -y ca-certificates curl libarchive-tools; \ + ln -s /usr/local ${JAVA_HOME}; \ + } \ && set -ex \ - && apt-get update \ - && apt-get install -y ca-certificates gnupg dirmngr --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* \ - && export GNUPGHOME="$(mktemp -d)" \ - && for key in \ - CACB9FE09150307D1D22D82962754C3B3ABCFE23 \ - ; do \ - gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys "$key" ; \ - done \ - && chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg \ - && echo "deb http://dist.sapmachine.io/debian/${ARCH}/ ./" | tee /etc/apt/sources.list.d/sapmachine.list \ - && apt-get update \ - && apt-get install -y sapmachine-$(echo ${SAPMACHINE_VERSION} | cut -d. -f1)-jdk=${SAPMACHINE_VERSION} --no-install-recommends \ - && rm -rf "$GNUPGHOME" /var/lib/apt/lists/* \ - && apt-get remove --purge --autoremove -y ca-certificates gnupg dirmngr \ + && if [ $(echo ${SAPMACHINE_VERSION} | cut -d. -f1) -le 8 ]; then \ + sapjvm_install; \ + else \ + sapmachine_install; \ + fi \ # smoke test && echo "SAPMachine ${SAPMACHINE_VERSION} install smoke test!" \ - && java --version + && java -version # Install Maven RUN set -ex \ @@ -212,6 +241,13 @@ RUN set -ex \ && python2.7 --version \ && python3 --version -ENV PATH=$PATH:./node_modules/.bin HOME=${MTA_USER_HOME} +# Allow global npm packages install without sudo +RUN set -ex \ + && mkdir ${MTA_USER_HOME}/.npm-global \ + && mkdir ${MTA_USER_HOME}/.npm-global/lib \ + && chown -R ${MTA_USER}:${MTA_USER} ${MTA_USER_HOME} +ENV NPM_CONFIG_PREFIX ${MTA_USER_HOME}/.npm-global + +ENV PATH=$PATH:./node_modules/.bin:${MTA_USER_HOME}/.npm-global/bin WORKDIR /project USER ${MTA_USER} \ No newline at end of file diff --git a/cmd/testdata/mtahtml5/mta.sh b/cmd/testdata/mtahtml5/mta.sh index fdf3eead3..e6466e020 100644 --- a/cmd/testdata/mtahtml5/mta.sh +++ b/cmd/testdata/mtahtml5/mta.sh @@ -16,7 +16,7 @@ # ----Executing build for module ui5app ------- # installing module dependencies & execute grunt & remove dev dependencies - (npm install && grunt && npm prune production ) & + (npm install && grunt && npm prune production) & # wait to the process to finish wait # Pack module after build for deployment diff --git a/integration/testdata/mtahtml5/mta.sh b/integration/testdata/mtahtml5/mta.sh index fdf3eead3..e6466e020 100755 --- a/integration/testdata/mtahtml5/mta.sh +++ b/integration/testdata/mtahtml5/mta.sh @@ -16,7 +16,7 @@ # ----Executing build for module ui5app ------- # installing module dependencies & execute grunt & remove dev dependencies - (npm install && grunt && npm prune production ) & + (npm install && grunt && npm prune production) & # wait to the process to finish wait # Pack module after build for deployment diff --git a/scripts/build_image b/scripts/build_image index 405c6ea44..18db585fb 100644 --- a/scripts/build_image +++ b/scripts/build_image @@ -19,7 +19,8 @@ echo "Build mbtci${JAVA_VERSION}${NODE_VERSION}:${MBT_VERSION}" docker build -t mbtci${JAVA_VERSION}${NODE_VERSION}:${MBT_VERSION} . # test image -if [ "$JAVA_MAJOR_VERSION" = "11" ] || [ "$JAVA_MAJOR_VERSION" = "17" ] || [ "$JAVA_MAJOR_VERSION" = "19" ]; then +if [ "$JAVA_MAJOR_VERSION" = "8" ] || [ "$JAVA_MAJOR_VERSION" = "11" ] || \ + [ "$JAVA_MAJOR_VERSION" = "17" ] || [ "$JAVA_MAJOR_VERSION" = "19" ]; then cp test/goss/goss_template.yaml test/goss/goss.yaml sed_i "s/NODE_VERSION_TEMPLATE/${NODE_VERSION_TEMPLATE}/" test/goss/goss.yaml sed_i "s/JAVA_VERSION_TEMPLATE/${JAVA_VERSION_TEMPLATE}/" test/goss/goss.yaml diff --git a/scripts/common_image b/scripts/common_image index 804616b7c..3a5509b67 100644 --- a/scripts/common_image +++ b/scripts/common_image @@ -11,7 +11,7 @@ export NODE_MAJOR_VERSION="$(echo ${NODE_VERSION_TEMPLATE}|awk -F. '{printf "%d" echo "Java major version: ${JAVA_MAJOR_VERSION}, Node major version: ${NODE_MAJOR_VERSION}" -if ([ "$JAVA_MAJOR_VERSION" -ne "11" ] && [ "$JAVA_MAJOR_VERSION" -ne "17" ] && [ "$JAVA_MAJOR_VERSION" -ne "19" ]) || \ +if ([ "$JAVA_MAJOR_VERSION" -ne "8" ] && [ "$JAVA_MAJOR_VERSION" -ne "11" ] && [ "$JAVA_MAJOR_VERSION" -ne "17" ] && [ "$JAVA_MAJOR_VERSION" -ne "19" ]) || \ ([ "$NODE_MAJOR_VERSION" -ne "14" ] && [ "$NODE_MAJOR_VERSION" -ne "16" ] && [ "$NODE_MAJOR_VERSION" -ne "18" ]) then echo "Java: ${JAVA_MAJOR_VERSION}, Node: ${NODE_MAJOR_VERSION} combination is not supported!" diff --git a/test/goss/goss_template.yaml b/test/goss/goss_template.yaml index 1c2140616..480f7e4da 100644 --- a/test/goss/goss_template.yaml +++ b/test/goss/goss_template.yaml @@ -9,8 +9,6 @@ package: installed: true python3: installed: true - make: - installed: true user: mta: exists: true @@ -41,6 +39,15 @@ command: exit-status: 0 stdout: - vNODE_VERSION_TEMPLATE + # verify installed UI5 + ui5 --version: + exit-status: 0 + # verify installed grunt + grunt --version: + exit-status: 0 + # verify installed go + go version: + exit-status:0 # verify NPM @sap-scope registry NOT configured npm config get @sap:registry: exit-status: 0 @@ -54,3 +61,9 @@ command: cd ~ && npm install @sap/cds: exit-status: 0 timeout: 50000 + cd ~ && npm install -g @sap/cds: + exit-status: 0 + timeout: 50000 + cd ~ && npm link @sap/cds --local: + exit-status: 0 + timeout: 50000 From 5f2bc7f3e559f04f4a7b9e08cd78b7ab0469a95a Mon Sep 17 00:00:00 2001 From: CloudMTABot Date: Tue, 7 Feb 2023 10:27:41 +0000 Subject: [PATCH 3/5] [skip ci] Bump version 1.2.22 --- Dockerfile_mbtci_template | 2 +- VERSION | 2 +- configs/version.yaml | 2 +- internal/version/version_cfg.go | 2 +- package.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile_mbtci_template b/Dockerfile_mbtci_template index 08a87c77a..09aeb9f35 100644 --- a/Dockerfile_mbtci_template +++ b/Dockerfile_mbtci_template @@ -3,7 +3,7 @@ FROM debian:bullseye-slim # Build time arguments ARG MTA_USER="mta" ARG MTA_USER_HOME="/home/${MTA_USER}" -ARG MBT_VERSION=1.2.21 +ARG MBT_VERSION=1.2.22 ARG GO_VERSION=1.19.3 ARG NODE_VERSION=NODE_VERSION_TEMPLATE ARG MAVEN_VERSION=3.8.7 diff --git a/VERSION b/VERSION index 9728bd69a..9a83513ab 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.21 +1.2.22 diff --git a/configs/version.yaml b/configs/version.yaml index 8331d7aa7..b8bed4817 100644 --- a/configs/version.yaml +++ b/configs/version.yaml @@ -1,2 +1,2 @@ -cli_version: 1.2.21 +cli_version: 1.2.22 makefile_version: 0.0.1 diff --git a/internal/version/version_cfg.go b/internal/version/version_cfg.go index 20f45d4f8..4ef53fc3d 100644 --- a/internal/version/version_cfg.go +++ b/internal/version/version_cfg.go @@ -1,4 +1,4 @@ package version // VersionConfig - do not edit -var VersionConfig = []byte{0x63, 0x6c, 0x69, 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x31, 0x2e, 0x32, 0x2e, 0x32, 0x31, 0xa, 0x6d, 0x61, 0x6b, 0x65, 0x66, 0x69, 0x6c, 0x65, 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x30, 0x2e, 0x30, 0x2e, 0x31, 0xa} +var VersionConfig = []byte{0x63, 0x6c, 0x69, 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x31, 0x2e, 0x32, 0x2e, 0x32, 0x32, 0xa, 0x6d, 0x61, 0x6b, 0x65, 0x66, 0x69, 0x6c, 0x65, 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x30, 0x2e, 0x30, 0x2e, 0x31, 0xa} diff --git a/package.json b/package.json index c80448b16..f7c05c22f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mbt", - "version": "1.2.21", + "version": "1.2.22", "description": "[![CircleCI](https://circleci.com/gh/SAP/cloud-mta-build-tool.svg?style=svg&circle-token=ecedd1dce3592adcd72ee4c61481972c32dcfad7)](https://circleci.com/gh/SAP/cloud-mta-build-tool) [![Go Report Card](https://goreportcard.com/badge/github.com/SAP/cloud-mta-build-tool)](https://goreportcard.com/report/github.com/SAP/cloud-mta-build-tool) [![Coverage Status](https://coveralls.io/repos/github/SAP/cloud-mta-build-tool/badge.svg?branch=cover)](https://coveralls.io/github/SAP/cloud-mta-build-tool?branch=cover) ![GitHub license](https://img.shields.io/badge/license-Apache_2.0-blue.svg) ![pre-alpha](https://img.shields.io/badge/Release-pre--alpha-orange.svg)", "main": "index.js", "files": [ From 1aebf024767f3967d70f37c0a3769ed893638874 Mon Sep 17 00:00:00 2001 From: "young.yang03" Date: Tue, 7 Feb 2023 18:42:36 +0800 Subject: [PATCH 4/5] Updated config.yml --- .circleci/config.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b3d8c191d..1d3a5e933 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -142,7 +142,7 @@ jobs: publish-to-dockerhub-java8-node14: docker: - image: cimg/go:1.17 - working_directory: ~/go/src/github.com/young-yang03/cloud-mta-build-tool + working_directory: ~/go/src/github.com/SAP/cloud-mta-build-tool steps: - checkout - setup_remote_docker: @@ -166,10 +166,10 @@ jobs: echo "Image release: ${MBT_VERSION}" #Push to Docker Hub echo "$DOCKER_HUB_TOKEN" | docker login --username $DOCKER_HUB_USER --password-stdin - sh $PWD/scripts/publish_image 8.1.091 14.21.1 ${MBT_VERSION} "cobra217" + sh $PWD/scripts/publish_image 8.1.091 14.21.1 ${MBT_VERSION} "devxci" #Push to GitHub Container Registry echo "$CLOUD_MTA_BOT_GITHUB_TOKEN" | docker login "ghcr.io" --username $CLOUD_MTA_BOT_USER --password-stdin - sh $PWD/scripts/publish_image 8.1.091 14.21.1 ${MBT_VERSION} "ghcr.io/young-yang03" + sh $PWD/scripts/publish_image 8.1.091 14.21.1 ${MBT_VERSION} "ghcr.io/sap" publish-to-dockerhub-java8-node16: docker: @@ -198,10 +198,10 @@ jobs: echo "Image release: ${MBT_VERSION}" #Push to Docker Hub echo "$DOCKER_HUB_TOKEN" | docker login --username $DOCKER_HUB_USER --password-stdin - sh $PWD/scripts/publish_image 8.1.091 16.18.1 ${MBT_VERSION} "cobra217" + sh $PWD/scripts/publish_image 8.1.091 16.18.1 ${MBT_VERSION} "devxci" #Push to GitHub Container Registry echo "$CLOUD_MTA_BOT_GITHUB_TOKEN" | docker login "ghcr.io" --username $CLOUD_MTA_BOT_USER --password-stdin - sh $PWD/scripts/publish_image 8.1.091 16.18.1 ${MBT_VERSION} "ghcr.io/young-yang03" + sh $PWD/scripts/publish_image 8.1.091 16.18.1 ${MBT_VERSION} "ghcr.io/sap" publish-to-dockerhub-java8-node18: docker: @@ -230,10 +230,10 @@ jobs: echo "Image release: ${MBT_VERSION}" #Push to Docker Hub echo "$DOCKER_HUB_TOKEN" | docker login --username $DOCKER_HUB_USER --password-stdin - sh $PWD/scripts/publish_image 8.1.091 18.12.1 ${MBT_VERSION} "cobra217" + sh $PWD/scripts/publish_image 8.1.091 18.12.1 ${MBT_VERSION} "devxci" #Push to GitHub Container Registry echo "$CLOUD_MTA_BOT_GITHUB_TOKEN" | docker login "ghcr.io" --username $CLOUD_MTA_BOT_USER --password-stdin - sh $PWD/scripts/publish_image 8.1.091 18.12.1 ${MBT_VERSION} "ghcr.io/young-yang03" + sh $PWD/scripts/publish_image 8.1.091 18.12.1 ${MBT_VERSION} "ghcr.io/sap" publish-to-dockerhub-java11-node14: docker: From c2cdc916e7509e6d64d465797b0582537b02c4dc Mon Sep 17 00:00:00 2001 From: CloudMTABot Date: Tue, 7 Feb 2023 11:10:28 +0000 Subject: [PATCH 5/5] [skip ci] Bump version 1.2.23 --- Dockerfile_mbtci_template | 2 +- VERSION | 2 +- configs/version.yaml | 2 +- internal/version/version_cfg.go | 2 +- package.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile_mbtci_template b/Dockerfile_mbtci_template index 09aeb9f35..8188edb24 100644 --- a/Dockerfile_mbtci_template +++ b/Dockerfile_mbtci_template @@ -3,7 +3,7 @@ FROM debian:bullseye-slim # Build time arguments ARG MTA_USER="mta" ARG MTA_USER_HOME="/home/${MTA_USER}" -ARG MBT_VERSION=1.2.22 +ARG MBT_VERSION=1.2.23 ARG GO_VERSION=1.19.3 ARG NODE_VERSION=NODE_VERSION_TEMPLATE ARG MAVEN_VERSION=3.8.7 diff --git a/VERSION b/VERSION index 9a83513ab..a93a6f757 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.22 +1.2.23 diff --git a/configs/version.yaml b/configs/version.yaml index b8bed4817..dc42b3347 100644 --- a/configs/version.yaml +++ b/configs/version.yaml @@ -1,2 +1,2 @@ -cli_version: 1.2.22 +cli_version: 1.2.23 makefile_version: 0.0.1 diff --git a/internal/version/version_cfg.go b/internal/version/version_cfg.go index 4ef53fc3d..7b2ff0178 100644 --- a/internal/version/version_cfg.go +++ b/internal/version/version_cfg.go @@ -1,4 +1,4 @@ package version // VersionConfig - do not edit -var VersionConfig = []byte{0x63, 0x6c, 0x69, 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x31, 0x2e, 0x32, 0x2e, 0x32, 0x32, 0xa, 0x6d, 0x61, 0x6b, 0x65, 0x66, 0x69, 0x6c, 0x65, 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x30, 0x2e, 0x30, 0x2e, 0x31, 0xa} +var VersionConfig = []byte{0x63, 0x6c, 0x69, 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x31, 0x2e, 0x32, 0x2e, 0x32, 0x33, 0xa, 0x6d, 0x61, 0x6b, 0x65, 0x66, 0x69, 0x6c, 0x65, 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x30, 0x2e, 0x30, 0x2e, 0x31, 0xa} diff --git a/package.json b/package.json index f7c05c22f..98e70898a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mbt", - "version": "1.2.22", + "version": "1.2.23", "description": "[![CircleCI](https://circleci.com/gh/SAP/cloud-mta-build-tool.svg?style=svg&circle-token=ecedd1dce3592adcd72ee4c61481972c32dcfad7)](https://circleci.com/gh/SAP/cloud-mta-build-tool) [![Go Report Card](https://goreportcard.com/badge/github.com/SAP/cloud-mta-build-tool)](https://goreportcard.com/report/github.com/SAP/cloud-mta-build-tool) [![Coverage Status](https://coveralls.io/repos/github/SAP/cloud-mta-build-tool/badge.svg?branch=cover)](https://coveralls.io/github/SAP/cloud-mta-build-tool?branch=cover) ![GitHub license](https://img.shields.io/badge/license-Apache_2.0-blue.svg) ![pre-alpha](https://img.shields.io/badge/Release-pre--alpha-orange.svg)", "main": "index.js", "files": [