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 2d38843
Show file tree
Hide file tree
Showing 3 changed files with 115 additions and 2 deletions.
114 changes: 114 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
name: CI
on:
push:
branches:
- master
pull_request:
jobs:
linux:
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
name: [linux-amd64-clang, linux-amd64-gcc]
include:
- name: linux-amd64-clang
compiler: clang
- name: linux-amd64-gcc
compiler: gcc
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 \
valgrind
- name: Build
env:
CC: ${{ matrix.compiler }}
run: |
autoreconf -fi
rm src/lexer.c src/lexer.h
rm src/parser.c src/parser.h
./configure --disable-valgrind --with-oniguruma=builtin YACC="$(which bison) -y" $COVERAGE
make -j4
make dist
- name: Test
env:
CC: ${{ matrix.compiler }}
run: |
ulimit -c unlimited
make -j4 check
- name: Show Test Logs
if: ${{ failure() }}
run: |
cat test-suite.log
cat tests/*.log
- name: Upload Artifacts
uses: actions/upload-artifact@v3
with:
name: jq-${{ matrix.name }}
path: |
jq
macos:
runs-on: macos-13
strategy:
fail-fast: false
matrix:
arch: [x86_64, arm64]
include:
- arch: x86_64
suffix: amd64
- arch: arm64
suffix: arm64
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
rm src/lexer.c src/lexer.h
rm src/parser.c src/parser.h
./configure --disable-valgrind --with-oniguruma=builtin --host=${{ matrix.arch }}-apple-darwin$(uname -r) YACC="$(brew --prefix)/opt/bison/bin/bison -y" $COVERAGE
make -j4
make dist
- name: Test
env:
CC: clang -arch ${{ matrix.arch }}
run: |
ulimit -c unlimited
make -j4 check
- name: Show Test Logs
if: ${{ failure() }}
run: |
cat test-suite.log
cat tests/*.log
- name: Upload Artifacts
uses: actions/upload-artifact@v3
with:
name: jq-macos-${{ matrix.suffix }}
path: |
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 2d38843

Please sign in to comment.