Skip to content

Commit

Permalink
Fix double-installed doc (jqlang#2482)
Browse files Browse the repository at this point in the history
The README symlink was causing the file to be installed twice in
<DOCDIR>.
  • Loading branch information
h3xx authored and owenthereal committed Jun 17, 2023
1 parent 076d0a2 commit aa136b8
Show file tree
Hide file tree
Showing 3 changed files with 205 additions and 2 deletions.
204 changes: 204 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,204 @@
name: CI
on:
push:
branches:
- master
pull_request:
jobs:
linux:
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
arch: [x86_64]
include:
- arch: x86_64
suffix: amd64
steps:
- name: Clone repository
uses: actions/checkout@v3
with:
submodules: true
- name: Install packages
run: |
sudo apt-get update -qq
sudo apt-get install -y \
automake \
autoconf \
bison \
flex \
gdb \
python3
- name: Build
env:
CC: clang -arch ${{ matrix.arch }}
run: |
autoreconf -fi
./configure --disable-dependency-tracking \
--disable-silent-rules \
--disable-maintainer-mode \
--disable-valgrind \
--with-oniguruma=builtin \
YACC="$(which bison) -y"
make
make dist
- name: Test
env:
CC: clang -arch ${{ matrix.arch }}
run: |
make check
- name: Upload Test Logs
if: ${{ failure() }}
uses: actions/upload-artifact@v3
with:
name: test-logs-linux-${{ matrix.arch }}
retention-days: 7
path: |
test-suite.log
tests/*.log
- name: Upload Artifacts
uses: actions/upload-artifact@v3
with:
name: jq-linux-${{ matrix.suffix }}
if-no-files-found: error
retention-days: 7
path: |
jq
macos:
runs-on: macos-13
strategy:
fail-fast: false
matrix:
arch: [x86_64]
include:
- arch: x86_64
suffix: amd64
steps:
- name: Clone repository
uses: actions/checkout@v3
with:
submodules: true
- name: Install packages
run: |
brew update
brew install \
autoconf \
automake \
libtool \
flex \
bison
sed -i.bak '/^AM_INIT_AUTOMAKE(\[-Wno-portability 1\.14\])$/s/14/11/' modules/oniguruma/configure.ac
- name: Build
env:
CC: clang -arch ${{ matrix.arch }}
run: |
autoreconf -fi
./configure --disable-dependency-tracking \
--disable-silent-rules \
--disable-maintainer-mode \
--disable-valgrind \
--with-oniguruma=builtin \
YACC="$(brew --prefix)/opt/bison/bin/bison -y"
make
make dist
- name: Test
env:
CC: clang -arch ${{ matrix.arch }}
run: |
make check
- name: Upload Test Logs
if: ${{ failure() }}
uses: actions/upload-artifact@v3
with:
name: test-logs-macos-${{ matrix.arch }}
retention-days: 7
path: |
test-suite.log
tests/*.log
- name: Upload Artifacts
uses: actions/upload-artifact@v3
with:
name: jq-macos-${{ matrix.suffix }}
if-no-files-found: error
retention-days: 7
path: |
jq
windows:
runs-on: windows-latest
strategy:
fail-fast: false
matrix:
arch: [x86_64]
include:
- arch: x86_64
suffix: win64
steps:
- name: Clone repository
uses: actions/checkout@v3
with:
submodules: true
- uses: msys2/setup-msys2@v2
with:
update: true
install: >-
base-devel
git
clang
autoconf
automake
libtool
- name: Build
shell: msys2 {0}
run: |
autoreconf -fi
./configure --disable-dependency-tracking \
--disable-silent-rules \
--disable-maintainer-mode \
--disable-valgrind \
--with-oniguruma=builtin \
--disable-shared \
--enable-static \
--enable-all-static
make
make dist
- name: Test
shell: msys2 {0}
run: |
make SUBDIRS= "TESTS=tests/mantest tests/jqtest tests/onigtest tests/base64test" check
- name: Upload Test Logs
if: ${{ failure() }}
uses: actions/upload-artifact@v3
with:
name: test-logs-windows-${{ matrix.arch }}
retention-days: 7
path: |
test-suite.log
tests/*.log
- name: Upload Artifacts
uses: actions/upload-artifact@v3
with:
name: jq-windows-${{ matrix.suffix }}
if-no-files-found: error
retention-days: 7
path: |
jq.exe
release:
runs-on: ubuntu-latest
permissions: write-all
needs: [linux, macos, windows]
steps:
- name: Clone repository
uses: actions/checkout@v3
with:
submodules: true
- name: Merge built artifacts
uses: actions/download-artifact@v3
with:
path: artifacts
- name: Upload release
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
ls -R artifacts
gh release create v0.0.1 --draft --title "jq version 0.0.1" --generate-notes
gh release upload v0.0.1 artifacts/jq-*
2 changes: 1 addition & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ EXTRA_DIST = $(DOC_FILES) $(man_MANS) $(TESTS) $(TEST_LOG_COMPILER) \

# README.md is expected in GitHub projects, good stuff in it, so we'll
# distribute it and install it with the package in the doc directory.
dist_doc_DATA = README.md COPYING AUTHORS README
dist_doc_DATA = README.md COPYING AUTHORS

pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libjq.pc
Expand Down
1 change: 0 additions & 1 deletion README

This file was deleted.

0 comments on commit aa136b8

Please sign in to comment.