From bacbd2e6e4be665fefdfea8dedb4c87bff9b1342 Mon Sep 17 00:00:00 2001 From: Alex Osadchyy Date: Wed, 30 Dec 2020 10:58:01 -0800 Subject: [PATCH 1/4] Build binaries for IBM Z (s390x) architecture --- .travis.yml | 6 +++++- package.json | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3337c5c..3e27966 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,10 @@ language: node_js node_js: - "lts/*" +arch: + - amd64 + - s390x + services: - docker @@ -13,7 +17,7 @@ env: script: # Audit npm packages. Fail build whan a PR audit fails, otherwise report the vulnerability and proceed. - if [ "${TRAVIS_PULL_REQUEST}" != "false" ]; then npm audit; else npm audit || true; fi - - npm run lint + - if [[ "$TRAVIS_CPU_ARCH" != "s390x" ]]; then npm run lint; else npm run lint-s390x; fi - npm test - docker build --rm -t "quay.io/razee/remoteresources3:${TRAVIS_COMMIT}" . - if [ -n "${TRAVIS_TAG}" ]; then docker tag quay.io/razee/remoteresources3:${TRAVIS_COMMIT} quay.io/razee/remoteresources3:${TRAVIS_TAG}; fi diff --git a/package.json b/package.json index be84711..b7c0a6d 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "test:debug": "mocha --inspect-brk", "check-coverage": "nyc check-coverage --statements 0 --branches 0 --functions 0 --lines 0", "lint": "npx npm-run-all eslint markdownlint yaml-lint jsonlint shellcheck", + "lint-s390x": "npx npm-run-all eslint markdownlint yaml-lint jsonlint", "eslint": "npx eslint src/", "markdownlint": "npx markdownlint README.md docs/", "dockerlint": "npx dockerlint Dockerfile", From 398ac85491692db47673a9f177ef57c13d53aa09 Mon Sep 17 00:00:00 2001 From: Alex Osadchyy Date: Fri, 22 Jan 2021 13:08:23 -0800 Subject: [PATCH 2/4] No separate linting on s390x architecture required --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 450705e..053f519 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,6 @@ "test:debug": "mocha --inspect-brk", "check-coverage": "nyc check-coverage --statements 0 --branches 0 --functions 0 --lines 0", "lint": "npx npm-run-all eslint markdownlint yaml-lint jsonlint shellcheck", - "lint-s390x": "npx npm-run-all eslint markdownlint yaml-lint jsonlint", "eslint": "npx eslint src/", "markdownlint": "npx markdownlint README.md docs/", "dockerlint": "npx dockerlint Dockerfile", From 0cbb6fe23ec6274f7229f1bebd6a8719f76cafa2 Mon Sep 17 00:00:00 2001 From: Alex Lewitt <48691328+alewitt2@users.noreply.github.com> Date: Mon, 25 Jan 2021 14:02:14 -0500 Subject: [PATCH 3/4] newline --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 059335b..d96dfd8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -158,4 +158,5 @@ jobs: on: tags: true condition: ${TRAVIS_TAG} =~ ^[0-9]+\.[0-9]+\.[0-9]+$ - \ No newline at end of file + + From a8163bfec3965c21c46ca749ad3bb3bf995801c1 Mon Sep 17 00:00:00 2001 From: Alex Lewitt <48691328+alewitt2@users.noreply.github.com> Date: Mon, 25 Jan 2021 14:02:44 -0500 Subject: [PATCH 4/4] Update .travis.yml --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d96dfd8..0aca5a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -158,5 +158,3 @@ jobs: on: tags: true condition: ${TRAVIS_TAG} =~ ^[0-9]+\.[0-9]+\.[0-9]+$ - -