mirror of
https://github.com/jb55/nostril.git
synced 2024-06-02 07:44:09 -04:00
Merge 3b15349fd2
into 8726ad3b15
This commit is contained in:
commit
9893adb70c
17
.github/workflows/c-cpp.yml
vendored
17
.github/workflows/c-cpp.yml
vendored
|
@ -1,17 +0,0 @@
|
||||||
name: C/C++ CI
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches: [ "master", "**" ]
|
|
||||||
pull_request:
|
|
||||||
branches: [ "master" ]
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build:
|
|
||||||
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v3
|
|
||||||
- name: make
|
|
||||||
run: make
|
|
50
.github/workflows/macos-matrix.yml
vendored
Normal file
50
.github/workflows/macos-matrix.yml
vendored
Normal file
|
@ -0,0 +1,50 @@
|
||||||
|
name: macos-matrix
|
||||||
|
|
||||||
|
# Controls when the action will run.
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
branches:
|
||||||
|
- '*'
|
||||||
|
- '*/*'
|
||||||
|
- '**'
|
||||||
|
- 'master'
|
||||||
|
- 'main'
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- '*'
|
||||||
|
- '*/*'
|
||||||
|
- '**'
|
||||||
|
- 'master'
|
||||||
|
- 'main'
|
||||||
|
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
|
||||||
|
jobs:
|
||||||
|
macos-build_and_test:
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
os: [macos-latest, macos-11, macos-12]
|
||||||
|
runs-on: ${{ matrix.os }}
|
||||||
|
steps:
|
||||||
|
- uses: styfle/cancel-workflow-action@0.11.0
|
||||||
|
with:
|
||||||
|
access_token: ${{ github.token }}
|
||||||
|
- uses: actions/checkout@v2
|
||||||
|
- name: printenv
|
||||||
|
run: |
|
||||||
|
brew install libtool autoconf automake
|
||||||
|
printenv
|
||||||
|
- name: make
|
||||||
|
run: |
|
||||||
|
make
|
||||||
|
- name: sudo make install
|
||||||
|
run: |
|
||||||
|
sudo make install
|
||||||
|
- name: man nostril
|
||||||
|
run: |
|
||||||
|
man nostril
|
||||||
|
- name: sudo -su runner nostril
|
||||||
|
run: |
|
||||||
|
#pipe handles non-zero return from nostril default help
|
||||||
|
sudo -su runner nostril | echo "${PIPESTATUS[0]}"
|
42
.github/workflows/macos-pre-release.yml
vendored
Normal file
42
.github/workflows/macos-pre-release.yml
vendored
Normal file
|
@ -0,0 +1,42 @@
|
||||||
|
name: macos-pre-release
|
||||||
|
|
||||||
|
# Controls when the action will run.
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- 'master'
|
||||||
|
- '**-pre-release'
|
||||||
|
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
|
||||||
|
jobs:
|
||||||
|
pre-release:
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
os: [macos-11, macos-12, macos-latest]
|
||||||
|
runs-on: ${{ matrix.os }}
|
||||||
|
steps:
|
||||||
|
- uses: styfle/cancel-workflow-action@0.11.0
|
||||||
|
with:
|
||||||
|
access_token: ${{ github.token }}
|
||||||
|
- uses: actions/checkout@v2
|
||||||
|
- name: "build pre-release"
|
||||||
|
run: |
|
||||||
|
brew install libtool autoconf automake
|
||||||
|
printenv
|
||||||
|
make
|
||||||
|
shasum -a 256 nostril > nostril.sha256.txt
|
||||||
|
- name: Save state
|
||||||
|
run: echo "{name}={value}" >> $GITHUB_STATE
|
||||||
|
- name: Set output
|
||||||
|
run: echo "{name}={value}" >> $GITHUB_OUTPUT
|
||||||
|
- uses: "marvinpinto/action-automatic-releases@latest"
|
||||||
|
with:
|
||||||
|
repo_token: "${{ secrets.GITHUB_TOKEN }}"
|
||||||
|
automatic_release_tag: ${{ matrix.os }}
|
||||||
|
prerelease: true
|
||||||
|
title: "Development Build"
|
||||||
|
files: |
|
||||||
|
nostril
|
||||||
|
nostril.sha256.txt
|
49
.github/workflows/ubuntu-matrix.yml
vendored
Normal file
49
.github/workflows/ubuntu-matrix.yml
vendored
Normal file
|
@ -0,0 +1,49 @@
|
||||||
|
name: ubuntu-matrix
|
||||||
|
|
||||||
|
# Controls when the action will run.
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
branches:
|
||||||
|
- '*'
|
||||||
|
- '*/*'
|
||||||
|
- '**'
|
||||||
|
- 'master'
|
||||||
|
- 'main'
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- '*'
|
||||||
|
- '*/*'
|
||||||
|
- '**'
|
||||||
|
- 'master'
|
||||||
|
- 'main'
|
||||||
|
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
|
||||||
|
jobs:
|
||||||
|
ubuntu-build_and_test:
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
os: [ubuntu-20.04, ubuntu-latest]
|
||||||
|
runs-on: ${{ matrix.os }}
|
||||||
|
steps:
|
||||||
|
- uses: styfle/cancel-workflow-action@0.11.0
|
||||||
|
with:
|
||||||
|
access_token: ${{ github.token }}
|
||||||
|
- uses: actions/checkout@v2
|
||||||
|
- name: printenv
|
||||||
|
run: |
|
||||||
|
printenv
|
||||||
|
- name: make
|
||||||
|
run: |
|
||||||
|
make
|
||||||
|
- name: sudo make install
|
||||||
|
run: |
|
||||||
|
sudo make install
|
||||||
|
- name: man nostril
|
||||||
|
run: |
|
||||||
|
man nostril
|
||||||
|
- name: sudo -su runner nostril
|
||||||
|
run: |
|
||||||
|
#pipe handles non-zero return from nostril default help
|
||||||
|
sudo -su runner nostril | echo "${PIPESTATUS[0]}"
|
40
.github/workflows/ubuntu-pre-release.yml
vendored
Normal file
40
.github/workflows/ubuntu-pre-release.yml
vendored
Normal file
|
@ -0,0 +1,40 @@
|
||||||
|
name: ubuntu-pre-release
|
||||||
|
|
||||||
|
# Controls when the action will run.
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- 'master'
|
||||||
|
- '**-pre-release'
|
||||||
|
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
|
||||||
|
jobs:
|
||||||
|
pre-release:
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
os: [ubuntu-20.04, ubuntu-22.04, ubuntu-latest]
|
||||||
|
runs-on: ${{ matrix.os }}
|
||||||
|
steps:
|
||||||
|
- uses: styfle/cancel-workflow-action@0.11.0
|
||||||
|
with:
|
||||||
|
access_token: ${{ github.token }}
|
||||||
|
- uses: actions/checkout@v2
|
||||||
|
- name: "build pre-release"
|
||||||
|
run: |
|
||||||
|
make
|
||||||
|
shasum -a 256 nostril > nostril.sha256.txt
|
||||||
|
- name: Save state
|
||||||
|
run: echo "{name}={value}" >> $GITHUB_STATE
|
||||||
|
- name: Set output
|
||||||
|
run: echo "{name}={value}" >> $GITHUB_OUTPUT
|
||||||
|
- uses: "marvinpinto/action-automatic-releases@latest"
|
||||||
|
with:
|
||||||
|
repo_token: "${{ secrets.GITHUB_TOKEN }}"
|
||||||
|
automatic_release_tag: ${{ matrix.os }}
|
||||||
|
prerelease: true
|
||||||
|
title: "Development Build"
|
||||||
|
files: |
|
||||||
|
nostril
|
||||||
|
nostril.sha256.txt
|
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -21,3 +21,6 @@ scripts/nostr-req
|
||||||
scripts/subnote
|
scripts/subnote
|
||||||
/dist
|
/dist
|
||||||
/version
|
/version
|
||||||
|
|
||||||
|
.DS_Store
|
||||||
|
deps/.DS_Store
|
||||||
|
|
7
Makefile
7
Makefile
|
@ -55,9 +55,10 @@ nostril: $(HEADERS) $(OBJS) $(ARS)
|
||||||
$(CC) $(CFLAGS) $(OBJS) $(ARS) -o $@
|
$(CC) $(CFLAGS) $(OBJS) $(ARS) -o $@
|
||||||
|
|
||||||
install: all
|
install: all
|
||||||
install -Dm644 doc/nostril.1 $(PREFIX)/share/man/man1/nostril.1
|
mkdir -p $(PREFIX)/bin
|
||||||
install -Dm755 nostril $(PREFIX)/bin/nostril
|
install -m644 doc/nostril.1 $(PREFIX)/share/man/man1/nostril.1
|
||||||
install -Dm755 nostril-query $(PREFIX)/bin/nostril-query
|
install -m755 nostril $(PREFIX)/bin/nostril
|
||||||
|
install -m755 nostril-query $(PREFIX)/bin/nostril-query
|
||||||
|
|
||||||
config.h: configurator
|
config.h: configurator
|
||||||
./configurator > $@
|
./configurator > $@
|
||||||
|
|
Loading…
Reference in New Issue
Block a user