Skip to content

Commit

Permalink
fix: 3pl and gh actions being horrible
Browse files Browse the repository at this point in the history
  • Loading branch information
WyvernIXTL committed Oct 11, 2024
1 parent 77a5406 commit 4c773a8
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 49 deletions.
48 changes: 1 addition & 47 deletions .github/workflows/compile-and-release-on-version-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,32 +18,8 @@ jobs:
changelog: CHANGELOG.md
token: ${{ secrets.GITHUB_TOKEN }}

cargo-3pl:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Compile Cargo 3pl
shell: bash
run: "cargo install cargo-3pl"
- name: Remove old 3rd Party Licenses
shell: bash
run: "rm -f ./LICENSE-3RD-PARTY.txt"
- name: Generate 3rd Party Licenses
shell: bash
run: "cargo 3pl > ./LICENSE-3RD-PARTY.txt"
- name: Add dict license to 3r party licenses
shell: bash
run: "cat ./dictionary/LICENSE-DICTIONARY.txt >> ./LICENSE-3RD-PARTY.txt"
- name: Upload as Artifact
uses: actions/upload-artifact@v4
with:
name: 3rd-party-licenses-artifact
path: ./LICENSE-3RD-PARTY.txt
if-no-files-found: error
retention-days: 1

compile-and-upload:
needs: [create-release, cargo-3pl]
needs: [create-release]
strategy:
matrix:
include:
Expand All @@ -68,13 +44,6 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- name: Remove old 3rd Party Licenses
shell: bash
run: "rm -f ./LICENSE-3RD-PARTY.txt"
- name: Download 3rd Party Licenses
uses: actions/download-artifact@v4
with:
name: 3rd-party-licenses-artifact
- uses: taiki-e/upload-rust-binary-action@v1
with:
bin: ubilerntui
Expand All @@ -85,7 +54,6 @@ jobs:
token: ${{ secrets.GITHUB_TOKEN }}

package-and-release-snap:
needs: [cargo-3pl]
runs-on: ubuntu-latest
strategy:
matrix:
Expand All @@ -95,13 +63,6 @@ jobs:
with:
fetch-tags: true
fetch-depth: 0
- name: Remove old 3rd Party Licenses
shell: bash
run: "rm -f ./LICENSE-3RD-PARTY.txt"
- name: Download 3rd Party Licenses
uses: actions/download-artifact@v4
with:
name: 3rd-party-licenses-artifact
- uses: snapcore/action-build@v1
id: snapbuild
with:
Expand All @@ -121,13 +82,6 @@ jobs:
- name: Install Cargo Deb
shell: bash
run: "cargo install cargo-deb"
- name: Remove old 3rd Party Licenses
shell: bash
run: "rm -f ./LICENSE-3RD-PARTY.txt"
- name: Download 3rd Party Licenses
uses: actions/download-artifact@v4
with:
name: 3rd-party-licenses-artifact
- name: Compile
shell: bash
run: "cargo deb -o ./target/debian/ubilerntui-x64.deb"
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [0.1.7] - 2024-10-11

### Changed

- Licenses are compressed resulting in smaller binary size.
- Git history is even more convoluted.

## [0.1.6] - 2024-05-28

### Added
Expand Down
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 = "ubilerntui"
version = "0.1.7"
version = "0.1.8"
edition = "2021"
authors = ["Adam McKellar"]
description = "This is a terminal UI for learning for the UKW-Sprechfunkzeugnis für den Binnenschiffahrtsfunk."
Expand Down

0 comments on commit 4c773a8

Please sign in to comment.