Skip to content

Commit 5c732f5

Browse files
authored
Merge pull request #263 from anoma/tiago/maint
Maintenance changes
2 parents 8a7ed05 + f7d4d25 commit 5c732f5

34 files changed

+8824
-62
lines changed

.github/workflows/queue_and_merge.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,12 @@ jobs:
3434
with:
3535
version: "25.0"
3636
repo-token: ${{ secrets.GITHUB_TOKEN }}
37+
- id: rust_toolchain
38+
run: echo "version=$(cat $GITHUB_WORKSPACE/rust-stable-version | tr -d '\n')" >> $GITHUB_OUTPUT
3739
- uses: actions-rust-lang/setup-rust-toolchain@v1
3840
with:
41+
toolchain: ${{ steps.rust_toolchain.outputs.version }}
42+
components: clippy
3943
cache: true
4044
- run: just clippy
4145

@@ -67,8 +71,11 @@ jobs:
6771
with:
6872
version: "25.0"
6973
repo-token: ${{ secrets.GITHUB_TOKEN }}
74+
- id: rust_toolchain
75+
run: echo "version=$(cat $GITHUB_WORKSPACE/rust-stable-version | tr -d '\n')" >> $GITHUB_OUTPUT
7076
- uses: actions-rust-lang/setup-rust-toolchain@v1
7177
with:
78+
toolchain: ${{ steps.rust_toolchain.outputs.version }}
7279
cache: true
7380
- run: just test
7481
env:
@@ -97,9 +104,11 @@ jobs:
97104
with:
98105
version: "25.0"
99106
repo-token: ${{ secrets.GITHUB_TOKEN }}
107+
- id: rust_toolchain
108+
run: echo "version=$(cat $GITHUB_WORKSPACE/rust-nightly-version | tr -d '\n')" >> $GITHUB_OUTPUT
100109
- uses: actions-rust-lang/setup-rust-toolchain@v1
101110
with:
102-
toolchain: nightly-2024-06-14
111+
toolchain: ${{ steps.rust_toolchain.outputs.version }}
103112
components: rustfmt
104113
cache: true
105114
- run: just fmt-check
@@ -194,4 +203,4 @@ jobs:
194203
run: |
195204
echo "ALL_SUCCESS=$(echo "$NEEDS_JSON" | jq '. | to_entries | map([.value.result == "success", .value.result == "skipped"] | any) | all')" >> $GITHUB_ENV
196205
- name: check outcomes
197-
run: "[ $ALL_SUCCESS == true ]"
206+
run: "[ $ALL_SUCCESS == true ]"

.gitignore

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,6 @@ Temporary Items
6868
debug/
6969
target/
7070

71-
# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
72-
# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
73-
Cargo.lock
74-
7571
# These are backup files generated by rustfmt
7672
**/*.rs.bk
7773

@@ -90,4 +86,4 @@ rust-project.json
9086
swagger-codegen.json
9187

9288
# Ignore docker compose override files
93-
docker-compose.override*
89+
docker-compose.override*

0 commit comments

Comments
 (0)