From ad9d685c3349c05d70d203c81596577995e98fda Mon Sep 17 00:00:00 2001 From: Jean-Michel Picod Date: Tue, 30 Apr 2024 10:29:29 +0200 Subject: [PATCH 1/8] Create dependabot.yml --- .github/dependabot.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..9722e5b1 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,27 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file + +version: 2 +updates: + - package-ecosystem: "cargo" + directory: "/" + lables: + - "dependencies" + # Run every Monday + schedule: + interval: "weekly" + timezone: "Europe/Zurich" + # Group PRs to avoid having to rebase/merge too many + groups: + dependabot: + patterns: + - "*" + # Only care about our direct dependencies + allow: + - dependency-type: "direct" + ignore: + # Filter out semver patches updates to reduce the frequency of updates + - dependency-name: "*" + update-types: ["version-update:semver-patch"] From c85d011c7fbd193aead539acbdf93611509196f2 Mon Sep 17 00:00:00 2001 From: Jean-Michel Picod Date: Tue, 30 Apr 2024 10:35:18 +0200 Subject: [PATCH 2/8] Update reproducible.yml Update python and actions versions --- .github/workflows/reproducible.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/reproducible.yml b/.github/workflows/reproducible.yml index fbb4adc0..8bcb3f35 100644 --- a/.github/workflows/reproducible.yml +++ b/.github/workflows/reproducible.yml @@ -13,14 +13,14 @@ jobs: fail-fast: false runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: submodules: "true" - name: Install Rust toolchain run: rustup show - - uses: actions/setup-python@v1 + - uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "3.12" - name: Set up OpenSK run: ./setup.sh From cfde66519681d42f7b214f0f5a1416ca70a1e85e Mon Sep 17 00:00:00 2001 From: Jean-Michel Picod Date: Tue, 30 Apr 2024 10:37:09 +0200 Subject: [PATCH 3/8] Update ci.yml Bump python and actions versions --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8503d53a..66c38db1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,9 +22,9 @@ jobs: permissions: contents: read steps: - - uses: actions/checkout@v3 - - uses: actions/setup-python@v1 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "3.12" - run: ./setup.sh - run: ./run_desktop_tests.sh From c07f645318d993150a4a1f9545738009129b0a05 Mon Sep 17 00:00:00 2001 From: Jean-Michel Picod Date: Tue, 30 Apr 2024 10:40:35 +0200 Subject: [PATCH 4/8] Update dependabot.yml Fix typo --- .github/dependabot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 9722e5b1..1c2fa0fe 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -7,7 +7,7 @@ version: 2 updates: - package-ecosystem: "cargo" directory: "/" - lables: + labels: - "dependencies" # Run every Monday schedule: From f58cf1c3f62076f7e01cd9c7d7a568ccefbee22b Mon Sep 17 00:00:00 2001 From: Jean-Michel Picod Date: Tue, 30 Apr 2024 10:45:22 +0200 Subject: [PATCH 5/8] Update deploy.py Ignore inconsistent quotes on 2 lines to avoid unnecessary escape sequences --- deploy.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/deploy.py b/deploy.py index 6dc21ca0..af841f64 100755 --- a/deploy.py +++ b/deploy.py @@ -419,7 +419,7 @@ def _build_app_or_example(self, is_example: bool): command = [ "cargo", "build", "--release", f"--target={props.arch}", - f"--features={','.join(self.args.features)}" + f"--features={','.join(self.args.features)}" # pylint: disable:W1405 ] if is_example: command.extend(["--example", self.args.application]) @@ -439,7 +439,8 @@ def _check_invariants(self): features = ["std"] features.extend(self.args.features) self.checked_command_output([ - "cargo", "test", f"--features={','.join(features)}", "--lib", + "cargo", "test", + f"--features={','.join(features)}", "--lib", # pylint: disable:W1405 "customization" ]) From 79458e1a0f80c70e2306a71b62f24028246ea3a7 Mon Sep 17 00:00:00 2001 From: Jean-Michel Picod Date: Tue, 30 Apr 2024 10:47:35 +0200 Subject: [PATCH 6/8] Update configure.py Ignore inconsistent quotes on 2 specific lines for avoid unnecessary escapes --- tools/configure.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/configure.py b/tools/configure.py index cfc0cb85..8bbbca5b 100755 --- a/tools/configure.py +++ b/tools/configure.py @@ -154,7 +154,9 @@ def main(args): ) status = {"cert": result[1], "pkey": result[2]} responses.append(status) + # pylint: disable-next=W1405 info(f"Certificate: {'Present' if result[1] else 'Missing'}") + # pylint: disable-next=W1405 info(f"Private Key: {'Present' if result[2] else 'Missing'}") if args.lock: info("Device is now locked down!") From 40c3c9cb2d85afe85a363db7a878231229a176d1 Mon Sep 17 00:00:00 2001 From: Jean-Michel Picod Date: Tue, 30 Apr 2024 10:50:45 +0200 Subject: [PATCH 7/8] Update deploy.py Typo in pylint comments --- deploy.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy.py b/deploy.py index af841f64..2cae74c5 100755 --- a/deploy.py +++ b/deploy.py @@ -419,7 +419,7 @@ def _build_app_or_example(self, is_example: bool): command = [ "cargo", "build", "--release", f"--target={props.arch}", - f"--features={','.join(self.args.features)}" # pylint: disable:W1405 + f"--features={','.join(self.args.features)}" # pylint: disable=W1405 ] if is_example: command.extend(["--example", self.args.application]) @@ -440,7 +440,7 @@ def _check_invariants(self): features.extend(self.args.features) self.checked_command_output([ "cargo", "test", - f"--features={','.join(features)}", "--lib", # pylint: disable:W1405 + f"--features={','.join(features)}", "--lib", # pylint: disable=W1405 "customization" ]) From 769025b6295d88ff17e590a48faf52b900de19a4 Mon Sep 17 00:00:00 2001 From: Jean-Michel Picod Date: Tue, 30 Apr 2024 10:54:31 +0200 Subject: [PATCH 8/8] Update deploy.py Now trying to make yapf happy... --- deploy.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/deploy.py b/deploy.py index 2cae74c5..3138c36d 100755 --- a/deploy.py +++ b/deploy.py @@ -418,7 +418,10 @@ def _build_app_or_example(self, is_example: bool): env["APP_HEAP_SIZE"] = str(APP_HEAP_SIZE) command = [ - "cargo", "build", "--release", f"--target={props.arch}", + "cargo", + "build", + "--release", + f"--target={props.arch}", f"--features={','.join(self.args.features)}" # pylint: disable=W1405 ] if is_example: @@ -439,8 +442,10 @@ def _check_invariants(self): features = ["std"] features.extend(self.args.features) self.checked_command_output([ - "cargo", "test", - f"--features={','.join(features)}", "--lib", # pylint: disable=W1405 + "cargo", + "test", + f"--features={','.join(features)}", # pylint: disable=W1405 + "--lib", "customization" ])