Skip to content

Commit 3e93f06

Browse files
committed
Fix the continuous integration workflow
1 parent be7a052 commit 3e93f06

File tree

5 files changed

+34
-32
lines changed

5 files changed

+34
-32
lines changed

.github/workflows/ci.yml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,26 +21,26 @@ jobs:
2121
- pinned
2222
- stable
2323
- nightly
24-
os: [ubuntu-22.04, macos-12]
24+
os: [ubuntu-22.04] # [ubuntu-22.04, macos-latest]
2525
include:
2626
- rust-build: pinned
2727
os: ubuntu-22.04
28-
rust: 1.70.0
28+
rust: 1.82.0
2929
- rust-build: stable
3030
os: ubuntu-22.04
3131
rust: stable
3232
- rust-build: nightly
3333
os: ubuntu-22.04
3434
rust: nightly
35-
- rust-build: pinned
36-
os: macos-12
37-
rust: 1.70.0
38-
- rust-build: stable
39-
os: macos-12
40-
rust: stable
41-
- rust-build: nightly
42-
os: macos-12
43-
rust: nightly
35+
# - rust-build: pinned
36+
# os: macos-latest
37+
# rust: 1.82.0
38+
# - rust-build: stable
39+
# os: macos-latest
40+
# rust: stable
41+
# - rust-build: nightly
42+
# os: macos-latest
43+
# rust: nightly
4444
runs-on: ${{ matrix.os }}
4545
env:
4646
RUST_BACKTRACE: 1
@@ -80,7 +80,7 @@ jobs:
8080
sudo apt-get install -y autoconf automake emacs liblzma-dev texlive
8181
8282
- name: Install Tools (macOS)
83-
if: matrix.os == 'macos-12'
83+
if: matrix.os == 'macos-latest'
8484
shell: bash
8585
run: |
8686
set -x
@@ -99,15 +99,15 @@ jobs:
9999
brew install --cask basictex
100100
101101
- name: Install a modern version of Texinfo
102-
if: matrix.os == 'macos-12'
102+
if: matrix.os == 'macos-latest'
103103
shell: bash
104104
run: |
105105
set -x
106106
mkdir tmp && cd tmp
107107
# TODO(sp1ff): cache this
108-
curl -L -O https://ftp.gnu.org/gnu/texinfo/texinfo-7.0.2.tar.gz
109-
tar xf texinfo-7.0.2.tar.gz
110-
cd texinfo-7.0.2
108+
curl -L -O https://ftp.gnu.org/gnu/texinfo/texinfo-7.2.tar.gz
109+
tar xf texinfo-7.2.tar.gz
110+
cd texinfo-7.2
111111
./configure
112112
make
113113
make install
@@ -156,7 +156,7 @@ jobs:
156156
run: make distcheck
157157

158158
- name: Check the Autotools distribution (MacOS)
159-
if: matrix.os == 'macos-12'
159+
if: matrix.os == 'macos-latest'
160160
shell: bash
161161
run: |
162162
eval "$(/usr/libexec/path_helper)"

ChangeLog

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
2025-08-05 Michael Herstine <sp1ff@pobox.com>
22

3+
Fix the continuous integration workflow
4+
35
Move to Snafu, for clients.rs, at least.
46
This patch is a first step toward moving to Snafu for mpdpopm
57
error handling. I'm primarily interested in getting more trouble-

README.org

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#+AUTHOR: Michael Herstine
33
#+DESCRIPTION: mpdpopm
44
#+EMAIL: sp1ff@pobox.com
5-
#+DATE: <2024-05-10 Fri 16:46>
5+
#+DATE: <2025-08-05 Tue 15:14>
66
#+AUTODATE: t
77

88
* Introduction
@@ -60,10 +60,10 @@ Thanks to a suggestion by [[https://github.com/m040601][m040601]], you can down
6060

6161
#+BEGIN_SRC bash
6262
cd /tmp
63-
curl -L --output mpdpopm-0.3.2.tar.gz https://github.com/sp1ff/mpdpopm/releases/download/0.3.2/mpdpopm-0.3.2-x86_64-unknown-linux.tar.gz
64-
tar xf mpdpopm-0.3.2.tar.gz
65-
tree mpdpopm-0.3.2-x86_64-unknown-linux/
66-
mpdpopm-0.3.2-x86_64-unknown-linux/
63+
curl -L --output mpdpopm-0.3.4.tar.gz https://github.com/sp1ff/mpdpopm/releases/download/0.3.4/mpdpopm-0.3.4-x86_64-unknown-linux.tar.gz
64+
tar xf mpdpopm-0.3.4.tar.gz
65+
tree mpdpopm-0.3.4-x86_64-unknown-linux/
66+
mpdpopm-0.3.4-x86_64-unknown-linux/
6767
├── bin
6868
│ ├── mppopm
6969
│ └── mppopmd
@@ -93,8 +93,8 @@ If you're running on a Debian-based Linux distribution, and you're on an x86_64
9393

9494
#+BEGIN_SRC bash
9595
cd /tmp
96-
curl -L -O https://github.com/sp1ff/mpdpopm/releases/download/0.3.2/mpdpopm_0.3.2_amd64.deb
97-
sudo dpkg -i mpdpopm_0.3.2_amd64.deb
96+
curl -L -O https://github.com/sp1ff/mpdpopm/releases/download/0.3.4/mpdpopm_0.3.4_amd64.deb
97+
sudo dpkg -i mpdpopm_0.3.4_amd64.deb
9898
#+END_SRC
9999

100100
The binaries will be placed in =/usr/local/bin=, and you can proceed to [[#getting_started][Getting Started]], below.
@@ -114,9 +114,9 @@ If you've got the Rust toolchain as well as Autotools installed, you can build f
114114

115115
#+BEGIN_SRC bash
116116
cd /tmp
117-
curl -L -O https://github.com/sp1ff/mpdpopm/releases/download/0.3.2/mpdpopm-0.3.2.tar.xz
118-
tar xf mpdpopm-0.3.2.tar.xz
119-
cd mpdpopm-0.3.2
117+
curl -L -O https://github.com/sp1ff/mpdpopm/releases/download/0.3.4/mpdpopm-0.3.4.tar.xz
118+
tar xf mpdpopm-0.3.4.tar.xz
119+
cd mpdpopm-0.3.4
120120
./configure
121121
make
122122
make check

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
AC_INIT([mpdpopm], [0.3.3], [sp1ff@pobox.com], [mpdpopm], [https://github.com/sp1ff/mpdpopm])
1+
AC_INIT([mpdpopm], [0.3.4], [sp1ff@pobox.com], [mpdpopm], [https://github.com/sp1ff/mpdpopm])
22
AC_CONFIG_AUX_DIR([build-aux])
33
AC_CONFIG_SRCDIR([mpdpopm/Cargo.toml.in])
44
AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability -Wno-override gnits std-options dist-xz dist-zstd])

doc/version.texi

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@set UPDATED 17 May 2024
2-
@set UPDATED-MONTH May 2024
3-
@set EDITION 0.3.3
4-
@set VERSION 0.3.3
1+
@set UPDATED 5 August 2025
2+
@set UPDATED-MONTH August 2025
3+
@set EDITION 0.3.4
4+
@set VERSION 0.3.4

0 commit comments

Comments
 (0)