Skip to content

Commit

Permalink
Merge pull request #70 from Decompollaborate/develop
Browse files Browse the repository at this point in the history
1.12.1
  • Loading branch information
AngheloAlf authored Dec 15, 2024
2 parents 21a849c + 33cc926 commit e3cc554
Show file tree
Hide file tree
Showing 25 changed files with 469 additions and 172 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/check_format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on: [push, pull_request]
jobs:
check_format:
name: Check format
runs-on: ubuntu-latest
runs-on: ubuntu-20.04

steps:
- name: Checkout reposistory
Expand All @@ -31,7 +31,7 @@ jobs:
check_tidy:
name: Check tidy
runs-on: ubuntu-latest
runs-on: ubuntu-20.04

steps:
- name: Checkout reposistory
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check_tables.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on: [push, pull_request]
jobs:
check_tables:
name: Check tables
runs-on: ubuntu-latest
runs-on: ubuntu-20.04

steps:
- name: Checkout reposistory
Expand Down
25 changes: 16 additions & 9 deletions .github/workflows/isolated_python_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,24 @@ on: [push, pull_request]
jobs:
buildstuff:
name: Build
runs-on: ubuntu-latest
runs-on: ubuntu-20.04

steps:
- name: Checkout reposistory
uses: actions/checkout@v4
- name: Checkout reposistory
uses: actions/checkout@v4

- name: Install dependencies
run: sudo apt update && sudo apt install -y python3-venv
- name: Install dependencies
run: sudo apt update && sudo apt install -y python3-venv

- name: Install build module
run: pip install build -U
- name: Setup venv
run: python3 -m venv .venv

- name: Build
run: python3 -m build
- name: Install build module
run: |
. .venv/bin/activate
python3 -m pip install build -U
- name: Build
run: |
. .venv/bin/activate
python3 -m build
22 changes: 11 additions & 11 deletions .github/workflows/make.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on: [push, pull_request]
jobs:
build_repo:
name: Build repo
runs-on: ubuntu-latest
runs-on: ubuntu-20.04

steps:
- name: Checkout reposistory
Expand All @@ -23,7 +23,7 @@ jobs:
build_info_checks:
name: Test - build_info_checks
needs: [build_repo]
runs-on: ubuntu-latest
runs-on: ubuntu-20.04

steps:
- name: Checkout reposistory
Expand All @@ -44,7 +44,7 @@ jobs:
logic_checks:
name: Test - logic_checks
needs: [build_repo]
runs-on: ubuntu-latest
runs-on: ubuntu-20.04

steps:
- name: Checkout reposistory
Expand All @@ -65,7 +65,7 @@ jobs:
instruction_checks_all:
name: Test - instruction_checks_all
needs: [build_repo]
runs-on: ubuntu-latest
runs-on: ubuntu-20.04

steps:
- name: Checkout reposistory
Expand All @@ -89,7 +89,7 @@ jobs:
instruction_checks_jalr:
name: Test - instruction_checks_jalr
needs: [build_repo]
runs-on: ubuntu-latest
runs-on: ubuntu-20.04

steps:
- name: Checkout reposistory
Expand All @@ -110,7 +110,7 @@ jobs:
instruction_checks_plain_disassembly:
name: Test - instruction_checks_plain_disassembly
needs: [build_repo]
runs-on: ubuntu-latest
runs-on: ubuntu-20.04

steps:
- name: Checkout reposistory
Expand All @@ -131,7 +131,7 @@ jobs:
instruction_checks_r3000gte_disasm:
name: Test - instruction_checks_r3000gte_disasm
needs: [build_repo]
runs-on: ubuntu-latest
runs-on: ubuntu-20.04

steps:
- name: Checkout reposistory
Expand All @@ -152,7 +152,7 @@ jobs:
instruction_checks_r4000allegrex_disasm:
name: Test - instruction_checks_r4000allegrex_disasm
needs: [build_repo]
runs-on: ubuntu-latest
runs-on: ubuntu-20.04

steps:
- name: Checkout reposistory
Expand All @@ -173,7 +173,7 @@ jobs:
instruction_checks_r4000allegrex_vfpu_disasm:
name: Test - instruction_checks_r4000allegrex_vfpu_disasm
needs: [build_repo]
runs-on: ubuntu-latest
runs-on: ubuntu-20.04

steps:
- name: Checkout reposistory
Expand All @@ -194,7 +194,7 @@ jobs:
instruction_checks_r5900_trunc_cvt:
name: Test - instruction_checks_r5900_trunc_cvt
needs: [build_repo]
runs-on: ubuntu-latest
runs-on: ubuntu-20.04

steps:
- name: Checkout reposistory
Expand All @@ -215,7 +215,7 @@ jobs:
instruction_checks_r5900_disasm:
name: Test - instruction_checks_r5900_disasm
needs: [build_repo]
runs-on: ubuntu-latest
runs-on: ubuntu-20.04

steps:
- name: Checkout reposistory
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/md_lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on: [push, pull_request]

jobs:
checks:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
name: Lint md files
steps:
- name: Checkout repository
Expand Down
112 changes: 84 additions & 28 deletions .github/workflows/publish_crate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,41 +4,97 @@ name: Build and upload Rust crate
on: [push, pull_request]

jobs:
build_rust:
name: Build Rust stuff and run Rust tests
runs-on: ubuntu-latest
check_fmt:
name: Check format
runs-on: ubuntu-20.04

steps:
- name: Checkout reposistory
uses: actions/checkout@v4

- name: Setup Rust toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true

- name: Check format
run: cargo fmt --check

check_clippy:
name: Check clippy lints
runs-on: ubuntu-20.04

steps:
- name: Checkout reposistory
uses: actions/checkout@v4

- name: Setup Rust toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true

- name: Setup clippy
run: rustup component add clippy

- name: Run clippy
run: |
cargo clippy --version
cargo clippy --all-targets --all-features -- -D warnings
run_tests:
name: Run Rust tests
runs-on: ubuntu-20.04

steps:
- name: Checkout reposistory
uses: actions/checkout@v4
- name: Checkout reposistory
uses: actions/checkout@v4

- name: Setup Rust toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true
- name: Setup Rust toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true

- name: Check format
run: cargo fmt --check
- name: Build Rust tests
run: cargo test --workspace

- name: Setup clippy
run: rustup component add clippy
msrv:
runs-on: ubuntu-latest
steps:
- name: Checkout reposistory
uses: actions/checkout@v4

- name: Run clippy
run: |
cargo clippy --version
cargo clippy --all-targets --all-features -- -D warnings
- name: Setup MSRV checker
uses: taiki-e/install-action@cargo-hack

# To find current MSRV use `cargo msrv find`. Install it with `cargo install cargo-msrv --locked`
- name: Run MSRV checker
run: cargo hack check --rust-version --workspace --all-targets --ignore-private

publish_crate:
name: Publish the crate!
runs-on: ubuntu-20.04
needs: [check_fmt, check_clippy, run_tests, msrv]

steps:
- name: Checkout reposistory
uses: actions/checkout@v4

- name: Build Rust package
run: cargo build --release --workspace
- name: Setup Rust toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true

- name: Build Rust tests
run: cargo test --workspace
- name: Build Rust package
run: cargo build --release --workspace

- name: Publish dry run
if: github.event_name == 'push' && !startsWith(github.ref, 'refs/tags/')
run: cargo publish --dry-run
- name: Publish dry run
if: github.event_name == 'push' && !startsWith(github.ref, 'refs/tags/')
run: cargo publish --dry-run

- name: Upload crate
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
run: cargo publish --token ${{ secrets.CARGO_REGISTRY_TOKEN }}
- name: Upload crate
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
run: cargo publish --token ${{ secrets.CARGO_REGISTRY_TOKEN }}
14 changes: 10 additions & 4 deletions .github/workflows/pypi_upload.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,27 @@ on:
# Pattern matched against refs/tags
tags:
- '**' # Push events to every tag including hierarchical tags like v1.0/beta
# on: [push, pull_request]

jobs:
build_wheels:
name: Build wheels on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
os: [ubuntu-20.04, macos-latest, windows-latest]

steps:
- name: Checkout reposistory
uses: actions/checkout@v4

- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: '3.9 - 3.13'

- name: Build wheels
uses: pypa/cibuildwheel@v2.16.5
uses: pypa/cibuildwheel@v2.22.0
env:
CIBW_ARCHS_WINDOWS: "auto"
CIBW_ARCHS_LINUX: "auto"
Expand All @@ -33,7 +39,7 @@ jobs:

build_sdist:
name: Build source distribution
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
steps:
- name: Checkout reposistory
uses: actions/checkout@v4
Expand All @@ -48,7 +54,7 @@ jobs:

upload_pypi:
needs: [build_wheels, build_sdist]
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
steps:
- uses: actions/download-artifact@v2
Expand Down
4 changes: 0 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -218,10 +218,6 @@ cython_debug/
# will have compiled files and executables
/target/

# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
Cargo.lock

# These are backup files generated by rustfmt
**/*.rs.bk

Expand Down
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [1.12.1] - 2024-07-21

### Added

- Set MSRV (minimal supported Rust version) to 1.66.1.
- Prebuilt binaries for Python 3.13.

### Changed

- Python 3.9 or above is now required.

### Fixed

- Fix some instructions missing their corresponding AccessType.
- Fix some new clippy lints.

## [1.12.0] - 2024-07-21

### Added
Expand Down Expand Up @@ -658,6 +674,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- First version

[unreleased]: https://github.com/Decompollaborate/rabbitizer/compare/master...develop
[1.12.1]: https://github.com/Decompollaborate/rabbitizer/compare/1.12.0...1.12.1
[1.12.0]: https://github.com/Decompollaborate/rabbitizer/compare/1.11.2...1.12.0
[1.11.2]: https://github.com/Decompollaborate/rabbitizer/compare/1.11.1...1.11.2
[1.11.1]: https://github.com/Decompollaborate/rabbitizer/compare/1.11.0...1.11.1
Expand Down
Loading

0 comments on commit e3cc554

Please sign in to comment.