Skip to content

Commit

Permalink
Fix Docker image used to open a PR to nixpkgs
Browse files Browse the repository at this point in the history
  • Loading branch information
PawelLipski committed Dec 19, 2020
1 parent 0258b41 commit 49cacb9
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 22 deletions.
4 changes: 4 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Release notes

## New in git-machete 2.15.9

- fixed: Docker image used to open a PR to nixpkgs

## New in git-machete 2.15.8

- improved: both `master` (or `main`) and `develop` are automatically treated as roots in `discover`
Expand Down
22 changes: 3 additions & 19 deletions ci/nixpkgs-pr/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,25 +1,9 @@
FROM nixos/nix

RUN nix-env -i bash curl git jq

WORKDIR /root
RUN set -x \
&& git clone --depth=1 https://github.com/github/hub.git \
&& cd /root/hub/ \
&& nix-env -i go gnumake \
&& make bin/hub \
&& nix-env -e go gnumake \
&& nix-collect-garbage -d \
&& mkdir -p /usr/local/bin/ \
&& cp bin/hub /usr/local/bin/ \
&& cd /root \
&& rm -r hub/
ENV PATH=$PATH:/usr/local/bin
RUN hub --version

RUN mkdir /root/nixpkgs
WORKDIR /root/nixpkgs
RUN nix-env -i bash curl git hub jq

COPY pr-description.md entrypoint.sh /root/
RUN chmod +x /root/entrypoint.sh
ENTRYPOINT /root/entrypoint.sh

WORKDIR /root/nixpkgs
4 changes: 2 additions & 2 deletions ci/nixpkgs-pr/build-context/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,5 @@ hub pull-request \
--head VirtusLab:$branch \
--message "$message" \
--labels='10.rebuild-darwin: 1-10,10.rebuild-linux: 1-10,11.by: upstream-developer'
# Deliberately not setting --reviewer (not needed + caused non-trivial issues with access of personal OAuth token to organization-owned repo:
# it could create a PR but could not set a reviewer, see https://travis-ci.com/VirtusLab/git-machete/jobs/657256851).
# Deliberately not setting `--reviewer`, since it's not strictly needed
# and caused non-trivial issues with access of personal OAuth token to organization-owned repo.
2 changes: 1 addition & 1 deletion git_machete/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '2.15.8'
__version__ = '2.15.9'

0 comments on commit 49cacb9

Please sign in to comment.