Skip to content

Commit

Permalink
Use autoconf install step even on standalone builds
Browse files Browse the repository at this point in the history
My previous implementation only used the configure step from autoconf.
Technically in this case it should have been enough, but it’s also kind
of an abuse of the tools, it was meant to have another stage.  This uses
the tools as they were designed, which in my history with autoconf is
always easier to maintain.  Also it gives us the option of using more
features or doing more fancy things in an install step without the
standalone versions being out of sync from system installed versions.
  • Loading branch information
alerque committed Jun 17, 2021
1 parent ecda7a8 commit 37dd081
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 13 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,16 @@ jobs:
--disable-tests \
--without-bash-completion-dir \
--without-zsh-completion-dir \
--program-suffix=-standalone.sh \
--with-deployment=standalone \
--bindir=/ \
COMM=comm GIT=git GREP=grep SED=sed SHELL=/bin/sh
make DESTDIR=. install-exec
- name: Upload standalone script artifact
uses: actions/upload-artifact@v2
with:
name: vcsh-standalone
path: vcsh
path: vcsh-standalone.sh

ghrelase:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -59,16 +62,13 @@ jobs:
uses: actions/download-artifact@v2
with:
name: vcsh-standalone
path: standalone
- name: Rename standalone deployment script
run: mv standalone/vcsh vcsh-standalone.sh
- name: Publish Release
uses: softprops/action-gh-release@v1
with:
body_path: changelog-HEAD
files: |
vcsh-${{ env.VERSION }}.zip
vcsh-${{ env.VERSION }}.tar.xz
vcsh-standalone.sh
standalone/vcsh-standalone.sh
env:
GITHUB_TOKEN: ${{ github.token }}
19 changes: 11 additions & 8 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,21 @@ jobs:
- name: Configure standalone script
run: |
./bootstrap.sh
./configure \
--without-man-page \
--disable-tests \
--without-bash-completion-dir \
--without-zsh-completion-dir \
--with-deployment=standalone \
COMM=comm GIT=git GREP=grep SED=sed SHELL=/bin/sh
./configure
--without-man-page \
--disable-tests \
--without-bash-completion-dir \
--without-zsh-completion-dir \
--with-deployment=standalone \
--program-suffix=-standalone.sh \
--bindir=/ \
COMM=comm GIT=git GREP=grep SED=sed SHELL=/bin/sh
make DESTDIR=. install-exec
- name: Post standalone script artifact
uses: actions/upload-artifact@v2
with:
name: vcsh-standalone
path: vcsh
path: vcsh-standalone.sh

test:
runs-on: ubuntu-latest
Expand Down

0 comments on commit 37dd081

Please sign in to comment.