Skip to content

Commit

Permalink
Merge branch 'main' into theme-switcher
Browse files Browse the repository at this point in the history
  • Loading branch information
Xithrius authored Oct 27, 2023
2 parents 2f02049 + d749d8d commit 9a40526
Show file tree
Hide file tree
Showing 35 changed files with 367 additions and 268 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions-rs/install@master
with:
crate: cargo-audit
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install Rust toolchain
uses: actions-rs/toolchain@v1
Expand Down Expand Up @@ -67,7 +67,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install Rust
run: |
Expand Down
34 changes: 34 additions & 0 deletions .github/workflows/flakehub.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Publish to FlakeHub

on:
push:
tags:
- "v?[0-9]+.[0-9]+.[0-9]+*"

workflow_dispatch:
inputs:
tag:
description: "The existing tag to publish to FlakeHub"
type: "string"
required: true

jobs:
flakehub-publish:
runs-on: "ubuntu-latest"

permissions:
id-token: "write"
contents: "read"

steps:
- uses: "actions/checkout@v3"
with:
ref: "${{ (inputs.tag != null) && format('refs/tags/{0}', inputs.tag) || '' }}"

- uses: "DeterminateSystems/nix-installer-action@main"

- uses: "DeterminateSystems/flakehub-push@main"
with:
visibility: "public"
name: "Xithrius/twitch-tui"
tag: "${{ inputs.tag }}"
2 changes: 1 addition & 1 deletion .github/workflows/mdbook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install mdBook
uses: peaceiris/actions-mdbook@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- run: cargo login ${CRATES_IO_TOKEN}
env:
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,6 @@
# Ignore Vim temporary and swap files.
*.sw?
*~

# Ignore nix build output
result
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v4.5.0
hooks:
- id: check-merge-conflict
- id: check-toml
Expand Down
Loading

0 comments on commit 9a40526

Please sign in to comment.