Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump rust-version to 1.67 (was 1.65) #1903

Merged
merged 4 commits into from
Oct 18, 2023
Merged

Conversation

sylvestre
Copy link
Collaborator

No description provided.

@codecov-commenter
Copy link

codecov-commenter commented Oct 17, 2023

Codecov Report

Attention: 29 lines in your changes are missing coverage. Please review.

Comparison is base (b28d686) 29.68% compared to head (dc3bf2b) 29.68%.
Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1903      +/-   ##
==========================================
- Coverage   29.68%   29.68%   -0.01%     
==========================================
  Files          50       50              
  Lines       17967    17964       -3     
  Branches     8662     8675      +13     
==========================================
- Hits         5334     5333       -1     
+ Misses       7469     7465       -4     
- Partials     5164     5166       +2     
Files Coverage Δ
src/test/utils.rs 38.77% <ø> (ø)
src/util.rs 30.90% <100.00%> (+0.90%) ⬆️
src/compiler/c.rs 36.86% <0.00%> (+1.15%) ⬆️
src/compiler/diab.rs 50.00% <0.00%> (ø)
src/compiler/gcc.rs 57.21% <0.00%> (+0.97%) ⬆️
src/test/tests.rs 34.01% <0.00%> (+0.68%) ⬆️
tests/system.rs 22.35% <0.00%> (ø)
src/compiler/msvc.rs 46.78% <0.00%> (+0.09%) ⬆️
src/compiler/nvcc.rs 41.17% <0.00%> (ø)
src/compiler/nvhpc.rs 34.09% <0.00%> (ø)
... and 4 more

... and 4 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@sylvestre sylvestre force-pushed the bump-rust branch 2 times, most recently from 665f580 to d6b959b Compare October 18, 2023 19:54
@sylvestre
Copy link
Collaborator Author

@Saviq do you know how to upgrade the rustc version in snap?
I am getting:
2023-10-18 20:07:03.279 :: 2023-10-18 20:07:02.756 :: package sccache v0.5.4 (/root/parts/sccache/build)cannot be built because it requires rustc 1.67.1 or newer, while the currently active rustc version is 1.66.1
thanks

@Saviq
Copy link
Contributor

Saviq commented Oct 18, 2023

@sylvestre this should do:

--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -32,6 +32,7 @@ apps:
 parts:
     sccache:
         plugin: rust
+        rust-channel: 1.67
         source: .
         override-pull: |
           craftctl default

I've asked for the documentation to be updated following the recent rewrite of the plugin.

@sylvestre
Copy link
Collaborator Author

@Saviq thanks but are you sure ?
I am getting:


2023-10-18 20:52:18.770 Bad snapcraft.yaml content:
- extra field 'rust-channel' not permitted in 'parts.sccache' configuration

@Saviq
Copy link
Contributor

Saviq commented Oct 18, 2023

@Saviq thanks but are you sure ?

Sorry, you'll also need:

--- a/.github/workflows/snap.yml
+++ b/.github/workflows/snap.yml
@@ -19,6 +19,7 @@ jobs:
     - name: Build and publish the snap
       uses: canonical/actions/build-snap@release
       with:
+        snapcraft-channel: edge
         review-opts: --allow-classic
         snapcraft-token: ${{ secrets.SNAPCRAFT_TOKEN }}
         publish: ${{ github.event_name == 'pull_request' && github.repository == github.event.pull_request.head.repo.full_name }}

It's not yet in a stable Snapcraft release - probably why the documentation isn't updated yet…

@sylvestre sylvestre merged commit 46f47cd into mozilla:main Oct 18, 2023
38 of 39 checks passed
@sylvestre sylvestre deleted the bump-rust branch October 19, 2023 08:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants