Skip to content

Commit

Permalink
removes target-arch from everywhere
Browse files Browse the repository at this point in the history
  • Loading branch information
@fpelliccioni
fpelliccioni committed Feb 23, 2021
1 parent 1fc6ec7 commit c946bd6
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 24 deletions.
25 changes: 17 additions & 8 deletions .github/workflows/knuth.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,19 @@ jobs:
- name: Generate Job Matrix
id: set-matrix
env:
# MATRIX: '{"config":[{"name":"Linux NodeJS 14","nodejs_version":"14","os":"ubuntu-20.04","os_kind":"linux","march_id":"x64-4fZKi37a595hP","test":"1"},
# {"name":"Linux NodeJS 12","nodejs_version":"12","os":"ubuntu-20.04","os_kind":"linux","march_id":"x64-4fZKi37a595hP","test":"1"},
# {"name":"macOS NodeJS 14","nodejs_version":"14","os":"macos-10.15","os_kind":"macos","march_id":"x64-4fZKi37a595hP","test":"0"},
# {"name":"macOS NodeJS 14 (*)","nodejs_version":"14","os":"macos-10.15","os_kind":"macos","march_id":"x64-4fZKi376M2D1R","test":"1"},
# {"name":"macOS NodeJS 12","nodejs_version":"12","os":"macos-10.15","os_kind":"macos","march_id":"x64-4fZKi37a595hP","test":"0"},
# {"name":"macOS NodeJS 12 (*)","nodejs_version":"12","os":"macos-10.15","os_kind":"macos","march_id":"x64-4fZKi376M2D1R","test":"1"},
# {"name":"Windows NodeJS 14","nodejs_version":"14","os":"windows-2019","os_kind":"windows","march_id":"x64-4fZKi37a595hP","test":"1"},
# {"name":"Windows NodeJS 12","nodejs_version":"12","os":"windows-2019","os_kind":"windows","march_id":"x64-4fZKi37a595hP","test":"1"},
# ]}'
MATRIX: '{"config":[{"name":"Linux NodeJS 14","nodejs_version":"14","os":"ubuntu-20.04","os_kind":"linux","march_id":"x64-4fZKi37a595hP","test":"1"},
{"name":"Linux NodeJS 12","nodejs_version":"12","os":"ubuntu-20.04","os_kind":"linux","march_id":"x64-4fZKi37a595hP","test":"1"},
{"name":"macOS NodeJS 14","nodejs_version":"14","os":"macos-10.15","os_kind":"macos","march_id":"x64-4fZKi37a595hP","test":"0"},
{"name":"macOS NodeJS 14 (*)","nodejs_version":"14","os":"macos-10.15","os_kind":"macos","march_id":"x64-4fZKi376M2D1R","test":"1"},
{"name":"macOS NodeJS 12","nodejs_version":"12","os":"macos-10.15","os_kind":"macos","march_id":"x64-4fZKi37a595hP","test":"0"},
{"name":"macOS NodeJS 12 (*)","nodejs_version":"12","os":"macos-10.15","os_kind":"macos","march_id":"x64-4fZKi376M2D1R","test":"1"},
{"name":"Windows NodeJS 14","nodejs_version":"14","os":"windows-2019","os_kind":"windows","march_id":"x64-4fZKi37a595hP","test":"1"},
{"name":"Windows NodeJS 12","nodejs_version":"12","os":"windows-2019","os_kind":"windows","march_id":"x64-4fZKi37a595hP","test":"1"},
]}'
Expand Down Expand Up @@ -146,16 +153,16 @@ jobs:
# npm install
# npm install --loglevel verbose
# KTH_MARCHID=4fZKi376M2D1R npm install --loglevel verbose
# npm install --target_arch=x64-4fZKi37a595hP --loglevel verbose
npm install --target_arch=${KTH_GHA_MARCH_ID} --loglevel verbose
# npm install --target_arch=${KTH_GHA_MARCH_ID} --loglevel verbose
npm install --loglevel verbose
if [[ "${KTH_GHA_RUN_TESTS}" == "1" ]]; then
npm run test
# /Users/runner/work/_temp/1cbd6dec-60ec-4181-81bd-cceaf2210ae3.sh: line 13: 37183 Illegal instruction: 4 npm run test
fi
# node-pre-gyp configure build package --verbose --target_arch=x64-4fZKi37a595hP
node-pre-gyp configure build package --verbose --target_arch=${KTH_GHA_MARCH_ID}
# node-pre-gyp configure build package --verbose --target_arch=${KTH_GHA_MARCH_ID}
node-pre-gyp configure build package --verbose
node-pre-gyp-github publish --release || true
Expand Down Expand Up @@ -211,12 +218,14 @@ jobs:
# npm install
# npm install --loglevel verbose
npm install --target_arch=${KTH_GHA_MARCH_ID} --loglevel verbose
# npm install --target_arch=${KTH_GHA_MARCH_ID} --loglevel verbose
npm install --loglevel verbose
npm run test
Remove-Item './deps' -Recurse
node-pre-gyp configure build package --target_arch=${KTH_GHA_MARCH_ID}
# node-pre-gyp configure build package --target_arch=${KTH_GHA_MARCH_ID}
node-pre-gyp configure build package
# node-pre-gyp configure --verbose
# node-pre-gyp build --verbose
# node-pre-gyp package --verbose
Expand Down
11 changes: 6 additions & 5 deletions .travis/entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,18 +50,19 @@ cd /home/conan/project

# npm cache clean
# npm install
# npm install --loglevel verbose
npm install --target_arch=${KTH_GHA_MARCH_ID} --loglevel verbose
npm install --loglevel verbose
# npm install --target_arch=${KTH_GHA_MARCH_ID} --loglevel verbose
npm run test

node-pre-gyp configure build package --target_arch=${KTH_GHA_MARCH_ID}
# node-pre-gyp configure build package --target_arch=${KTH_GHA_MARCH_ID}
node-pre-gyp configure build package
# node-pre-gyp-github publish || true
node-pre-gyp-github publish --release #|| true

node-pre-gyp clean
node-gyp clean

# npm install
npm install --target_arch=${KTH_GHA_MARCH_ID} --loglevel verbose
npm install
# npm install --target_arch=${KTH_GHA_MARCH_ID} --loglevel verbose

npm publish || true
3 changes: 2 additions & 1 deletion binding.gyp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@
'>(install_py)',
],
'outputs': [''],
'action': ['<!(node -p "process.env.npm_config_python || \\"python\\"")','>@(_inputs)', '<(DEPTH)', "<(target_arch)"]
# 'action': ['<!(node -p "process.env.npm_config_python || \\"python\\"")','>@(_inputs)', '<(DEPTH)', "<(target_arch)"]
'action': ['<!(node -p "process.env.npm_config_python || \\"python\\"")','>@(_inputs)', '<(DEPTH)']
},
],

Expand Down
20 changes: 12 additions & 8 deletions install.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,19 +132,23 @@ def run_conan(reference, march_id):
replace_boost_lib_names_on_windows('../deps/lib')

def get_march(arch):
arr = arch.split("-")
if len(arr) != 2:
march_id = os.getenv("KTH_MARCHID", "4fZKi37a595hP")
# march_id = os.getenv("KTH_MARCHID", None)
return march_id

march_id = arr[1]
march_id = os.getenv("KTH_MARCHID", "4fZKi37a595hP")
return march_id

# arr = arch.split("-")
# if len(arr) != 2:
# march_id = os.getenv("KTH_MARCHID", "4fZKi37a595hP")
# # march_id = os.getenv("KTH_MARCHID", None)
# return march_id

# march_id = arr[1]
# return march_id


if __name__ == '__main__':
recipe_dir = sys.argv[1]
user_arch = sys.argv[2]
# user_arch = sys.argv[2]
user_arch = None
march_id = get_march(user_arch)

print("----------------------------------------------------")
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "kth-bch-native",
"version": "0.9.27",
"version": "0.9.28",
"description": "Bitcoin Cash development platform for Javascript applications",
"repository": {
"type": "git",
Expand Down

0 comments on commit c946bd6

Please sign in to comment.