Skip to content

Commit

Permalink
Makefile: push via Vagrant to a branch
Browse files Browse the repository at this point in the history
In CI, we won't be on a branch.  When we try to push, we'll get an error
that we're not trying to push any refs.  To solve this, push HEAD to a
specific named branch.

Signed-off-by: brian m. carlson <[email protected]>
  • Loading branch information
bk2204 committed Oct 3, 2023
1 parent ade4162 commit bd3fcd2
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ ci-freebsd:
vagrant up
vagrant ssh -- sudo pkg install -y curl gettext git gmake rubygem-asciidoctor rust
vagrant ssh -- git init /home/vagrant/muter
GIT_SSH_COMMAND='f() { shift; vagrant ssh -- "$$@"; };f' git push vagrant@localhost:/home/vagrant/muter
GIT_SSH_COMMAND='f() { shift; vagrant ssh -- "$$@"; };f' git push vagrant@localhost:/home/vagrant/muter HEAD:refs/heads/dev
vagrant ssh -- "cd /home/vagrant/muter && git checkout $$(git rev-parse HEAD) && gmake test-full FEATURES=$(FEATURES)"

ci-netbsd:
Expand All @@ -110,7 +110,7 @@ ci-netbsd:
vagrant ssh -- sudo /usr/pkg/bin/pkgin update
vagrant ssh -- sudo /usr/pkg/bin/pkgin -y install mozilla-rootcerts-openssl curl gettext gettext-lib git gmake ruby31-asciidoctor rust
vagrant ssh -- git init /home/vagrant/muter
GIT_SSH_COMMAND='f() { shift; vagrant ssh -- "$$@"; };f' git push vagrant@localhost:/home/vagrant/muter
GIT_SSH_COMMAND='f() { shift; vagrant ssh -- "$$@"; };f' git push vagrant@localhost:/home/vagrant/muter HEAD:refs/heads/dev
vagrant ssh -- "cd /home/vagrant/muter && git checkout $$(git rev-parse HEAD) && gmake test-full ASCIIDOCTOR=asciidoctor31 CARGO_HTTP_MULTIPLEXING=false FEATURES=$(FEATURES) GETTEXT_DIR=/usr/pkg LD_LIBRARY_PATH=/usr/pkg/lib"

test-full:
Expand Down

0 comments on commit bd3fcd2

Please sign in to comment.