Skip to content

Commit

Permalink
Merge pull request #76 from lilopkins/1.0.3
Browse files Browse the repository at this point in the history
fixes #75
  • Loading branch information
Some-Birb7190 authored Dec 7, 2024
2 parents 7c44854 + 3a78732 commit 1d20641
Show file tree
Hide file tree
Showing 4 changed files with 65 additions and 28 deletions.
37 changes: 37 additions & 0 deletions .github/workflows/check-version-bumped.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Check version is suitable for merge to main

on:
pull_request:
branches:
- main

jobs:
check-version:
name: Check version
runs-on: ubuntu-latest

steps:
- name: Checkout this PR
uses: actions/checkout@v4
- name: Determine Cargo version of this PR
id: version-pr
run: |
export CARGO_PKG_VERSION=$(awk -F '["=]' '/^\[(workspace.)?package\]/{p=1} p && /^version[[:space:]]*=/ {gsub(/"/, "", $3); print $3; p=0}' Cargo.toml)
export CARGO_PKG_PRERELEASE=$([[ $CARGO_PKG_VERSION =~ -[0-9A-Za-z]+ ]] && echo "true" || echo "false")
echo "CARGO_PKG_VERSION=${CARGO_PKG_VERSION}" >> $GITHUB_OUTPUT
echo "CARGO_PKG_PRERELEASE=${CARGO_PKG_PRERELEASE}" >> $GITHUB_OUTPUT
- name: Checkout main
uses: actions/checkout@v4
with:
ref: main
- name: Determine Cargo version of main
id: version-main
run: |
export CARGO_PKG_VERSION=$(awk -F '["=]' '/^\[(workspace.)?package\]/{p=1} p && /^version[[:space:]]*=/ {gsub(/"/, "", $3); print $3; p=0}' Cargo.toml)
export CARGO_PKG_PRERELEASE=$([[ $CARGO_PKG_VERSION =~ -[0-9A-Za-z]+ ]] && echo "true" || echo "false")
echo "CARGO_PKG_VERSION=${CARGO_PKG_VERSION}" >> $GITHUB_OUTPUT
echo "CARGO_PKG_PRERELEASE=${CARGO_PKG_PRERELEASE}" >> $GITHUB_OUTPUT
- name: Assert versions are different
run: go run github.com/davidrjonas/semver-cli@latest greater ${{ steps.version-pr.outputs.CARGO_PKG_VERSION }} ${{ steps.version-main.outputs.CARGO_PKG_VERSION }}
53 changes: 26 additions & 27 deletions 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,7 +1,7 @@
[package]
name = "evidenceangel"
description = "Library and executables to work with EvidenceAngel evidence packages (*.evp)."
version = "1.0.2"
version = "1.0.3"
edition = "2021"
license = "GPL-3.0-or-later"
authors = [
Expand Down
1 change: 1 addition & 0 deletions src/evidenceangel-ui/author_factory.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ impl FactoryComponent for AuthorFactoryModel {
adw::ActionRow {
set_title: &self.author.name(),
set_subtitle: &self.author.email().clone().unwrap_or_default(),
set_use_markup: false,

add_suffix = &gtk::Button {
set_icon_name: relm4_icons::icon_names::CROSS_LARGE,
Expand Down

0 comments on commit 1d20641

Please sign in to comment.