Skip to content

Commit

Permalink
v1.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
bates64 committed Apr 29, 2023
1 parent 5629ed4 commit 98cdfd0
Show file tree
Hide file tree
Showing 8 changed files with 184 additions and 107 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
branches:
- main
tags:
- '*'
- 'v*'
pull_request:
workflow_dispatch:

Expand Down Expand Up @@ -104,7 +104,7 @@ jobs:
release:
name: Release
runs-on: ubuntu-latest
if: "startsWith(github.ref, 'refs/tags/')"
if: "startsWith(github.ref, 'refs/tags/v')"
needs: [linux, windows, macos, sdist]
steps:
- uses: actions/download-artifact@v3
Expand Down
51 changes: 0 additions & 51 deletions .github/workflows/release.yml

This file was deleted.

179 changes: 179 additions & 0 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,179 @@
name: Rust

on:
push:
branches:
- main
tags:
- 'v*'
pull_request:
workflow_dispatch:

env:
CARGO_TERM_COLOR: always

jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: stable

- uses: Swatinem/rust-cache@v1

- name: Download base ROM
run: curl -L $BASEROM_US_URL -o tests/baserom.z64
env:
BASEROM_US_URL: ${{ secrets.BASEROM_US_URL }}

- name: Set git user for tests
run: |
git config user.name "GitHub Actions"
git config user.email "[email protected]"
- name: Run tests
uses: actions-rs/cargo@v1
with:
command: test
args: --verbose --no-fail-fast
env:
RUST_BACKTRACE: full
RUST_LOG: debug

lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: nightly
components: clippy, rustfmt
override: true
- uses: actions-rs/cargo@v1
with:
command: check

crates-io:
name: Publish to crates.io
runs-on: ubuntu-latest
if: "startsWith(github.ref, 'refs/tags/v')"
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
- uses: actions-rs/cargo@v1
with:
command: package
args: --allow-dirty
- uses: actions-rs/cargo@v1
with:
command: publish
args: --allow-dirty
env:
CARGO_REGISTRY_TOKEN: ${{ secrets.CRATES_IO_TOKEN }}

macos:
name: Build for macOS
runs-on: macos-latest
strategy:
fail-fast: false
matrix:
target: [x86_64, aarch64]
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
target: ${{ matrix.target }}-apple-darwin
- uses: actions-rs/cargo@v1
with:
command: build
args: --release --target ${{ matrix.target }}-apple-darwin
- uses: actions/upload-artifact@v3
with:
name: merlon-macos-${{ matrix.target }}
path: target/release/merlon

linux:
name: Build for Linux
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
target: [x86_64]
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
target: ${{ matrix.target }}-unknown-linux-gnu
- uses: actions-rs/cargo@v1
with:
command: build
args: --release --target ${{ matrix.target }}-unknown-linux-gnu
- uses: actions/upload-artifact@v3
with:
name: merlon-linux-${{ matrix.target }}
path: target/release/merlon

github_prerelease:
name: Create GitHub prerelease
runs-on: ubuntu-latest
if: "!startsWith(github.ref, 'refs/tags/v')"
needs: [linux, macos]
steps:
- uses: actions/checkout@v2

# download artifacts from previous steps
- uses: actions/download-artifact@v3
with:
name: merlon-linux-x86_64
- uses: actions/download-artifact@v3
with:
name: merlon-linux-aarch64
- uses: actions/download-artifact@v3
with:
name: merlon-macos-x86_64
- uses: actions/download-artifact@v3
with:
name: merlon-macos-aarch64

# create release
- uses: "marvinpinto/action-automatic-releases@latest"
with:
repo_token: "${{ secrets.RELEASE_GITHUB_TOKEN }}"
automatic_release_tag: "latest"
prerelease: true
title: "Development Build"
files: |
merlon-linux-x86_64
merlon-linux-aarch64
merlon-macos-x86_64
merlon-macos-aarch64
LICENSE
github_release:
name: Create GitHub release
runs-on: ubuntu-latest
if: "startsWith(github.ref, 'refs/tags/v')"
needs: [linux, macos]
steps:
- uses: actions/checkout@v2

# download artifacts from previous steps
- uses: actions/download-artifact@v3

# create release
- uses: "marvinpinto/action-automatic-releases@latest"
with:
repo_token: "${{ secrets.RELEASE_GITHUB_TOKEN }}"
prerelease: false
title: "${{ github.ref }}"
files: |
merlon-linux-x86_64
merlon-macos-x86_64
merlon-macos-aarch64
LICENSE
50 changes: 0 additions & 50 deletions .github/workflows/test.yml

This file was deleted.

2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "merlon"
version = "1.1.0"
version = "1.2.0"
edition = "2021"
authors = ["Alex Bates <[email protected]>"]
description = "Mod package manager for the Paper Mario (N64) decompilation"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[![Merlon](assets/logo/logotype.png)](https://merlon.readthedocs.io)

[![](https://img.shields.io/github/actions/workflow/status/nanaian/merlon/test.yml?branch=main)](https://github.com/nanaian/merlon/actions)
[![](https://img.shields.io/github/actions/workflow/status/nanaian/merlon/rust.yml?branch=main)](https://github.com/nanaian/merlon/actions)
[![](https://img.shields.io/discord/279322074412089344?color=%237289DA&logo=discord&logoColor=ffffff)](https://discord.gg/paper-mario-modding-279322074412089344)
[![](https://img.shields.io/crates/v/merlon)](https://crates.io/crates/merlon)
[![](https://img.shields.io/pypi/v/merlon)](https://pypi.org/project/merlon/)
Expand Down
1 change: 0 additions & 1 deletion docs/getting_started.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ You can verify Merlon is installed by running the following command:

```console
$ merlon --version
Merlon 1.1.0
```

## Creating a new package
Expand Down

0 comments on commit 98cdfd0

Please sign in to comment.