diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-04-12 12:16:44 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-12 12:16:44 -0700 |
| commit | 6933d4611a94097681a1d8435290d9bb1c59f1f4 (patch) | |
| tree | 34333507f5c964c36ac3ae34ed8fff225fe5ef94 /contrib | |
| parent | ddffc7fa803fa22033459fd5666679179c3581bc (diff) | |
| parent | b6b0b6e8bd0f8c75fe9411f722a43f9305c6137a (diff) | |
| download | podman-6933d4611a94097681a1d8435290d9bb1c59f1f4.tar.gz podman-6933d4611a94097681a1d8435290d9bb1c59f1f4.tar.bz2 podman-6933d4611a94097681a1d8435290d9bb1c59f1f4.zip | |
Merge pull request #9381 from cevich/add_make_release
Reorganize and overhaul Makefile & release archive workflows
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/cirrus/pr-should-include-tests | 3 | ||||
| -rwxr-xr-x | contrib/cirrus/runner.sh | 5 | ||||
| -rw-r--r-- | contrib/msi/podman.wxs | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/contrib/cirrus/pr-should-include-tests b/contrib/cirrus/pr-should-include-tests index 2bc06df50..9ccac17a3 100755 --- a/contrib/cirrus/pr-should-include-tests +++ b/contrib/cirrus/pr-should-include-tests @@ -32,8 +32,9 @@ fi # This is OK if the only files being touched are "safe" ones. filtered_changes=$(git diff --name-status $base $head | awk '{print $2}' | - fgrep -vx Makefile | fgrep -vx .cirrus.yml | + fgrep -vx .gitignore | + fgrep -vx Makefile | fgrep -vx changelog.txt | fgrep -vx go.mod | fgrep -vx go.sum | diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh index 8d3a6b987..b463745d1 100755 --- a/contrib/cirrus/runner.sh +++ b/contrib/cirrus/runner.sh @@ -202,8 +202,7 @@ function _run_build() { # Ensure always start from clean-slate with all vendor modules downloaded make clean make vendor - make podman-release - make podman-remote-linux-release + make podman-release.tar.gz # includes podman, podman-remote, and docs } function _run_altbuild() { @@ -219,7 +218,7 @@ function _run_altbuild() { make build-all-new-commits GIT_BASE_BRANCH=origin/$DEST_BRANCH ;; *Windows*) - make podman-remote-windows-release + make podman-remote-release-windows.zip make podman.msi ;; *Without*) diff --git a/contrib/msi/podman.wxs b/contrib/msi/podman.wxs index ff8160a53..451dd565d 100644 --- a/contrib/msi/podman.wxs +++ b/contrib/msi/podman.wxs @@ -24,7 +24,7 @@ <CreateFolder/> </Component> <Component Id="MainExecutable" Guid="73752F94-6589-4C7B-ABED-39D655A19714"> - <File Id="520C6E17-77A2-4F41-9611-30FA763A0702" Name="podman.exe" Source="bin/podman-remote-windows.exe" KeyPath="yes"/> + <File Id="520C6E17-77A2-4F41-9611-30FA763A0702" Name="podman.exe" Source="bin/windows/podman.exe" KeyPath="yes"/> </Component> </Directory> </Directory> |