Skip to content

Commit 97c4691

Browse files
GH-CI-Fixes: miscellaneous fixes and enhancements (#558)
1 parent 0384ba4 commit 97c4691

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

azure-pipelines.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ stages:
9090
OperationType: 'Start'
9191
AgentResolution: '1080p'
9292

93-
- bash: node-ui/ci/build.sh && node-ui/ci/unit_tests.sh && node-ui/ci/ng_tests.sh && node-ui/ci/integration_tests.sh
93+
- bash: node-ui/ci/build.sh && node-ui/ci/unit_tests.sh && node-ui/ci/integration_tests.sh
9494
displayName: "Build NodeUI and run tests"
9595

9696
- task: Windows Application Driver@0
@@ -168,7 +168,10 @@ stages:
168168
- bash: ci/release.sh '$(Pipeline.Workspace)'
169169
env:
170170
PASSPHRASE: $(PASSPHRASE)
171+
AZURE_KEY_VAULT_URL: $(AZURE_KEY_VAULT_URL)
172+
AZURE_KEY_VAULT_CLIENT_ID: $(AZURE_KEY_VAULT_CLIENT_ID)
171173
AZURE_KEY_VAULT_CLIENT_SECRET: $(AZURE_KEY_VAULT_CLIENT_SECRET)
174+
AZURE_KEY_VAULT_CERTIFICATE: $(AZURE_KEY_VAULT_CERTIFICATE)
172175
displayName: "Build and generate artifacts"
173176

174177
- task: CopyFiles@2

ci/prepare_node_build.sh

+2
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,5 @@ CI_DIR="$( cd "$( dirname "$0" )" && pwd )"
44
TOOLCHAIN_HOME="$1"
55

66
source "$CI_DIR"/environment.sh "$TOOLCHAIN_HOME"
7+
8+
"$CI_DIR/format.sh"

ci/release.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ function azure_key_vault_sign() {
4949
--file-digest sha256 \
5050
--timestamp-rfc3161 http://timestamp.digicert.com \
5151
--timestamp-digest sha256 \
52-
--azure-key-vault-url https://substratumnode.vault.azure.net \
53-
--azure-key-vault-client-id "77cb9689-ce27-412f-bc16-4cc0a599676b" \
52+
--azure-key-vault-url "$AZURE_KEY_VAULT_URL" \
53+
--azure-key-vault-client-id "$AZURE_KEY_VAULT_CLIENT_ID" \
5454
--azure-key-vault-client-secret "$AZURE_KEY_VAULT_CLIENT_SECRET" \
55-
--azure-key-vault-certificate "SubstratumNodeCodeSigning"
55+
--azure-key-vault-certificate "$AZURE_KEY_VAULT_CERTIFICATE"
5656
done
5757
fi
5858
}

0 commit comments

Comments
 (0)