Skip to content

Commit cfb6057

Browse files
anacrolixclaude
andcommitted
Resolve merge conflicts with master
- Updated MSRV to 1.71.0 while keeping newer environment variables - Bumped version to 0.30.1 and updated bitflags to 2.3.3 - Fixed FD_SETSIZE type casting in test_select.rs 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]>
2 parents 395b17b + 09d66fe commit cfb6057

File tree

172 files changed

+8024
-2422
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

172 files changed

+8024
-2422
lines changed

.cirrus.yml

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ test: &TEST
3030
<< : *BUILD
3131
test_script:
3232
- . $HOME/.cargo/env || true
33-
- $TOOL test --target $TARGET --all-features
33+
- $TOOL test --target $TARGET
3434

3535
# Test FreeBSD in a full VM. Test the i686 target too, in the
3636
# same VM. The binary will be built in 32-bit mode, but will execute on a
@@ -42,7 +42,7 @@ task:
4242
matrix:
4343
- name: FreeBSD 14 amd64 & i686
4444
freebsd_instance:
45-
image_family: freebsd-14-0-snap
45+
image: freebsd-14-1-release-amd64-ufs
4646
cpu: 1
4747
# Enable tests that would fail on FreeBSD 12
4848
RUSTFLAGS: --cfg fbsd14 -D warnings
@@ -59,23 +59,8 @@ task:
5959
- . $HOME/.cargo/env
6060
- cargo build --target i686-unknown-freebsd --all-features
6161
- cargo doc --no-deps --target i686-unknown-freebsd --all-features
62-
- cargo test --target i686-unknown-freebsd --all-features
62+
- cargo test --target i686-unknown-freebsd
6363
i386_feature_script:
6464
- . $HOME/.cargo/env
6565
- if [ -z "$NOHACK" ]; then cargo hack check --each-feature --target i686-unknown-freebsd; fi
6666
before_cache_script: rm -rf $CARGO_HOME/registry/index
67-
68-
# Tasks for Linux aarch64 native builds
69-
task:
70-
matrix:
71-
- name: Linux aarch64
72-
arm_container:
73-
image: rust:1.69.0
74-
cpu: 1
75-
env:
76-
TARGET: aarch64-unknown-linux-gnu
77-
setup_script:
78-
- rustup target add $TARGET
79-
- rustup component add clippy
80-
<< : *TEST
81-
before_cache_script: rm -rf $CARGO_HOME/registry/index
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
name: 'Check new CHANGELOG'
2+
description: 'Check new CHANGELOG kind and PR number'
3+
4+
runs:
5+
using: "composite"
6+
steps:
7+
- name: Get newly added CHANGELOGs
8+
id: new-changelogs
9+
uses: tj-actions/changed-files@v44
10+
with:
11+
# Only checek the files under the `changelog` directory
12+
files: changelog/**
13+
14+
- name: Check them
15+
shell: bash
16+
if: steps.new-changelogs.outputs.added_files_count != 0
17+
env:
18+
NEW_CHANGELOGS: ${{ steps.new-changelogs.outputs.added_files }}
19+
PR_NUMBER: ${{ github.event.number }}
20+
run: |
21+
# `cl` will be something like "changelog/1.added.md"
22+
for cl in ${NEW_CHANGELOGS}; do
23+
# Trim the directory name
24+
prefix="changelog/"; trimmed_cl=${cl/#$prefix}; cl="${trimmed_cl}";
25+
26+
# parse it
27+
IFS='.' read id kind file_extension <<< "${cl}"
28+
29+
# Check the kind field
30+
if [ "$kind" != "added" ] && [ "$kind" != "changed" ] && [ "$kind" != "fixed" ] && [ "$kind" != "removed" ]; then
31+
echo "Invalid CHANGELOG kind [${kind}] from [${cl}], available options are [added, changed, fixed, removed]";
32+
exit 1;
33+
fi
34+
35+
# Check the file extension
36+
if [ "$file_extension" != "md" ]; then
37+
echo "Invalid file extension [${file_extension}] from [${cl}], it should be [md]";
38+
exit 1;
39+
fi
40+
41+
# Check PR number
42+
if [ "$id" != "$PR_NUMBER" ]; then
43+
echo "Mismatched PR number [${id}] from [${cl}], it should be ${PR_NUMBER}";
44+
exit 1;
45+
fi
46+
done

.github/actions/test/action.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ inputs:
55
TARGET:
66
required: true
77

8+
SUDO:
9+
description: 'Set it to an empty string to run the tests as the current user, leave it with the default value to test with "sudo"'
10+
required: false
11+
default: sudo --preserve-env=HOME
12+
813
TOOL:
914
description: 'Tool used to involve the test command, can be cargo or cross'
1015
required: false
@@ -24,4 +29,4 @@ runs:
2429
2530
- name: test
2631
shell: bash
27-
run: ${{ inputs.TOOL }} test --target ${{ inputs.TARGET }} --all-features
32+
run: ${{ inputs.SUDO }} $(which ${{ inputs.TOOL }}) test --target ${{ inputs.TARGET }}
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Check new CHANGELOGs
2+
3+
on:
4+
pull_request:
5+
types: [opened, synchronize, reopened]
6+
7+
permissions:
8+
contents: read
9+
10+
jobs:
11+
check_new_changelog:
12+
runs-on: ubuntu-24.04
13+
steps:
14+
- name: checkout
15+
uses: actions/checkout@v4
16+
17+
- name: check new CHANGELOG
18+
uses: ./.github/actions/check_new_changelog

0 commit comments

Comments
 (0)