Skip to content

Commit 7e06cbd

Browse files
committed
update workflow scripts
1 parent 07ae7be commit 7e06cbd

File tree

6 files changed

+30
-20
lines changed

6 files changed

+30
-20
lines changed

.github/tools/qnx_credential_helper.py

100644100755
Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,14 @@ def eprint(*args, **kwargs):
3636
if "SCORE_QNX_USER" in os.environ and "SCORE_QNX_PASSWORD" in os.environ:
3737
login = os.environ["SCORE_QNX_USER"]
3838
password = os.environ["SCORE_QNX_PASSWORD"]
39+
eprint("Got credentials from env variables")
3940
else:
4041
try:
4142
nrc = netrc.netrc()
4243
auth = nrc.authenticators("qnx.com")
4344
if auth:
4445
login, _, password = auth
46+
eprint("Got credentials from the netrc file")
4547
else:
4648
raise Exception("No credential found for QNX")
4749
except Exception as excp:
@@ -63,6 +65,8 @@ def eprint(*args, **kwargs):
6365
if r.status != 200:
6466
eprint("Failed to login to QNX")
6567
sys.exit(1)
68+
else:
69+
eprint("Log in was successfull")
6670

6771
cookies = {c.name: c.value for c in list(cookie_jar)}
6872
if not "myQNX" in cookies:
@@ -78,4 +82,4 @@ def eprint(*args, **kwargs):
7882
}
7983
}
8084
)
81-
)
85+
)

.github/workflows/build_and_test_host_gcc.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
# *******************************************************************************
23
# Copyright (c) 2024 Contributors to the Eclipse Foundation
34
#
@@ -33,7 +34,7 @@ jobs:
3334
uses: actions/checkout@v4.2.2
3435
- name: Bazel build communication targets
3536
run: |
36-
bazel build --config com-x86_64-linux //score/...
37+
bazel build //...
3738
- name: Bazel test communication targets
3839
run: |
39-
bazel test --config com-x86_64-linux //score/...
40+
bazel test //... --build_tests_only

.github/workflows/release_verification.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ jobs:
3434
uses: bazel-contrib/setup-bazel@0.9.1
3535
- name: Bazel build baselibs targets
3636
run: |
37-
bazel build --config com-x86_64-linux -- \
38-
//score/...
37+
bazel build --config com-x86_64-linux -- //score/mw/com:com
3938
build_target:
4039
runs-on: ubuntu-latest
4140
steps:
@@ -50,12 +49,13 @@ jobs:
5049
mkdir -p /opt/score_qnx/license
5150
echo "${SCORE_QNX_LICENSE}" | base64 --decode > /opt/score_qnx/license/licenses
5251
- name: Bazel build baselibs targets
52+
# Currently, only a subset of targets are building with QNX toolchain
53+
# due to various issues such as https://github.com/eclipse-score/baselibs/issues/28
5354
env:
5455
SCORE_QNX_USER: ${{ secrets.SCORE_QNX_USER }}
5556
SCORE_QNX_PASSWORD: ${{ secrets.SCORE_QNX_PASSWORD }}
5657
run: |
57-
bazel build --config com-x86_64-qnx --credential_helper=*.qnx.com=%worksapce%/.github/tools/qnx_credential_helper.py -- \
58-
//score/...
58+
bazel build --config com-x86_64-qnx --credential_helper=*.qnx.com=${{ github.workspace }}/.github/tools/qnx_credential_helper.py -- //score/mw/com:com
5959
- name: Cleanup QNX License
6060
if: always()
6161
run: rm -rf /opt/score_qnx
@@ -79,4 +79,4 @@ jobs:
7979
uses: nikhilbadyal/ghaction-rm-releases@v0.7.0
8080
with:
8181
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
82-
RELEASE_PATTERN: ${{ github.ref_name }}
82+
RELEASE_PATTERN: ${{ github.ref_name }}

MODULE.bazel

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,11 @@ download_archive(
9090
bazel_dep(name = "nlohmann_json", version = "3.11.3")
9191
bazel_dep(name = "bazel_skylib", version = "1.7.1")
9292
bazel_dep(name = "score_baselibs", version = "0.1.1")
93+
git_override(
94+
module_name = "score_baselibs",
95+
commit = "145b0f5cb076c706c67eb0ac33c6a5c3359bd3be",
96+
remote = "https://github.com/eclipse-score/baselibs.git",
97+
)
9398

9499
# Python 3.12 toolchain for Bazel (required for LOBSTER/TRLC dependencies)
95100
bazel_dep(name = "rules_python", version = "0.32.0")

MODULE.bazel.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

score/mw/com/requirements/BUILD

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
# *******************************************************************************
1313
load("//third_party/traceability/bazel:traceability.bzl", "safety_software_unit")
1414

15-
safety_software_unit(
16-
name = "safety_software_unit_com",
17-
# design = ["*.puml"], TODO: Add also design parts, work based on Zhaoxiong
18-
impl = ["//score/mw/com"],
19-
reqs = [
20-
"//score/mw/com/requirements/component_requirements:component_requirements_ipc",
21-
],
22-
tests = [
23-
"//score/mw/com:unit_test",
24-
],
25-
)
15+
# safety_software_unit(
16+
# name = "safety_software_unit_com",
17+
# # design = ["*.puml"], TODO: Add also design parts, work based on Zhaoxiong
18+
# impl = ["//score/mw/com"],
19+
# reqs = [
20+
# "//score/mw/com/requirements/component_requirements:component_requirements_ipc",
21+
# ],
22+
# tests = [
23+
# "//score/mw/com:unit_test",
24+
# ],
25+
# )

0 commit comments

Comments
 (0)