Skip to content
This repository was archived by the owner on Sep 27, 2022. It is now read-only.

Commit a29ab3b

Browse files
committed
feat: both openssl 3 and openssl 1 builds
1 parent 6a94325 commit a29ab3b

File tree

4 files changed

+42
-9
lines changed

4 files changed

+42
-9
lines changed

.github/workflows/build.yml

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
env:
88
CARGO_TERM_COLOR: always
99
jobs:
10-
build:
10+
old_build:
1111
runs-on: ubuntu-18.04
1212
steps:
1313
- run: sudo apt-get install -y libssl-dev libgtk-3-dev
@@ -19,9 +19,11 @@ jobs:
1919
key: target-dir-cache-release
2020
path: target/
2121

22+
# needed on older glibc
23+
- run: sed 's/resolv.*/resolv = "0.2.0"/' Cargo.toml
24+
2225
- run: cargo deb
2326
- run: cargo rpm build
24-
- run: find target/release/rpmbuild
2527

2628
- run: mv target/debian/timer-for-harvest_*_amd64.deb .
2729
- run: mv target/release/rpmbuild/RPMS/x86_64/timer-for-harvest*.rpm .
@@ -34,3 +36,29 @@ jobs:
3436
timer-for-harvest_*_amd64.deb
3537
timer-for-harvest*.rpm
3638
SHA256SUM
39+
build:
40+
runs-on: ubuntu-22.04
41+
steps:
42+
- run: sudo apt-get install -y libssl-dev libgtk-3-dev
43+
- run: cargo install cargo-deb cargo-rpm
44+
45+
- uses: actions/checkout@v2
46+
- uses: actions/cache@v2
47+
with:
48+
key: target-dir-cache-release
49+
path: target/
50+
51+
- run: cargo deb
52+
- run: cargo rpm build
53+
54+
- run: mv target/debian/timer-for-harvest_*_amd64.deb .
55+
- run: mv target/release/rpmbuild/RPMS/x86_64/timer-for-harvest*.rpm .
56+
- run: sha256sum *.deb *.rpm > SHA256SUM
57+
58+
- uses: actions/upload-artifact@v2
59+
with:
60+
name: packages
61+
path: |
62+
timer-for-harvest_*_amd64.deb
63+
timer-for-harvest*.rpm
64+
SHA256SUM

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22

33
## [UNRELEASED] - YYYY-MM-DD
44

5+
## [0.3.10] - 2022-07-29
6+
7+
- Build against OpenSSL 3 for Ubuntu 22.04.
8+
9+
## [0.3.9] - 2022-06-11
10+
11+
- Updates to dependencies. These dependencies needed to be updated because of various security issues.
512
- Clear selected task when switching project. Previously an invalid entry was still selected, which stopped the save button from working.
613

714
## [0.3.8] - 2021-09-21

Cargo.lock

Lines changed: 3 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "timer-for-harvest"
33
description = "Timer for Harvest"
44
homepage = "https://github.com/frenkel/timer-for-harvest"
5-
version = "0.3.9"
5+
version = "0.3.10"
66
authors = ["Frank Groeneveld <frank@frankgroeneveld.nl>"]
77
edition = "2018"
88
readme = "README.md"
@@ -34,7 +34,7 @@ chrono = "0.4.9"
3434
glib-sys = "0.9.1"
3535
hyper = "0.14.12"
3636
dirs = "2.0.2"
37-
resolv = "0.2.0"
37+
resolv = { git = "https://github.com/mikedilger/resolv-rs", rev = "63fce7c9c9b88a7c2c453bcf90c1eabb67500449" }
3838
version-compare = "0.0.10"
3939
gtk = { version = "0.7.0", features = ["v3_22"] }
4040
gdk = { version = "0.11.0", features = ["v3_22"] }

0 commit comments

Comments
 (0)