build release tarball: open source it #1474

Merged
merged 2 commits into from Jan 11, 2017

Projects

None yet

2 participants

@jeffkaufman
Member
  • change it from being given a branch to working on the current checkout
  • change it to work with create_distro_tarball, which was already opensourced
  • make it build openssl 1.0.2 if needed
@jeffkaufman jeffkaufman requested a review from morlovich Jan 11, 2017
@jeffkaufman
Member

Once this is in I'll backport it to branch 34

devel/build_release_tarball.sh
+ sudo apt-get install $deps
+fi
+
+# Checkout everything, then tarball the parts that we want.
@morlovich
morlovich Jan 11, 2017 Contributor

Does it actually check anything out here?

@jeffkaufman
jeffkaufman Jan 11, 2017 Member

sorry, that comment isn't needed anymore; fixed

devel/build_release_tarball.sh
+echo "Doing a test build inside $BUILD_DIR"
+cd "$BUILD_DIR"
+
+if openssl version | grep "^OpenSSL 1[.]0[.][01]"; then
@morlovich
morlovich Jan 11, 2017 Contributor

What with this do with OpenSSL 0.9.x, etc, or 1.1.0?

@jeffkaufman
jeffkaufman Jan 11, 2017 Member

Fixed to also object to 0.x.

1.1.0 is fine for us, and this grep won't object to it.

+# These tests fail because they are golded against a specific version of
+# compression libraries.
+# TODO(sligocki): Could we change the tests to be less fragile or test in a
+# different way in this case?
@morlovich
morlovich Jan 11, 2017 Contributor

I did do some of that in Debian package patches, though not sure exactly for these ones.

-else
- SRC_DIR=$2
-fi
+git submodule update --init --recursive
@morlovich
morlovich Jan 11, 2017 Contributor

Hmm, why keep this?
It does make sense to get rid of checkout stuff here at all, what with git now being the dev environment...

@jeffkaufman
jeffkaufman Jan 11, 2017 Member

We need this because otherwise if someone runs this in a clean client it will fail to find all the deps.

(I've tested this by getting a raw Ubuntu 14 LTS VM and running "git clone mps" and then running this script, which now succeeds. In addition to verifying that it succeeds on our workstations.)

- echo "You may want to rm -rf $CHECKOUT_DIR to clean up"
-fi
+cd "$MPS_CHECKOUT"
+rm -r "$TEMP_DIR"
@morlovich
morlovich Jan 11, 2017 Contributor

Did you compare contents of tarballs?

@jeffkaufman
jeffkaufman Jan 11, 2017 Member

Yes, it looks reasonable. The main change is that .mk and .pyc files aren't included anymore, which I think was one of your changes?

@jeffkaufman jeffkaufman build release tarball: open source it
* change it from being given a branch to working on the current checkout
* change it to work with create_distro_tarball, which was already opensourced
* make it build openssl 1.0.2 if needed
13181bb
@jeffkaufman
Member

@morlovich ready for another round of review

@morlovich
Contributor

I don't think you actually pushed it?

@jeffkaufman
Member

@morlovich

I don't think you actually pushed it?

Sorry, I did push it, but I forced pushed it because I wanted to squash down to one commit to cherry-pick onto 34 for testing.

@morlovich
Contributor

I think you could have squashed it afterwards, at the merge step? Anyway, Looking..

devel/build_release_tarball.sh
+# ~/release (where the binaries usually go).
+#
+# Note that if this fails you may need to tweak the file list inside
+# devel/create_distro_tarball.sh
@morlovich
morlovich Jan 11, 2017 Contributor

It may be worth documenting what distro this assumes.

@jeffkaufman
jeffkaufman Jan 11, 2017 Member

You mean that this only runs on Ubuntu 14 right now, like the rest of our dev environment?

@morlovich
morlovich Jan 11, 2017 Contributor

Yeah, mostly due to the package install step.

@jeffkaufman jeffkaufman doc ubuntu 14 dep
2f0d78a
@jeffkaufman jeffkaufman merged commit 6a15917 into master Jan 11, 2017

1 of 3 checks passed

continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
continuous-integration/travis-ci/push The Travis CI build is in progress
Details
cla/google All necessary CLAs are signed
@jeffkaufman jeffkaufman deleted the jefftk-opensource-brp branch Jan 11, 2017
@jeffkaufman jeffkaufman added a commit that referenced this pull request Jan 11, 2017
@jeffkaufman @jeffkaufman jeffkaufman + jeffkaufman build release tarball: open source it (#1474)
* build release tarball: open source it

* change it from being given a branch to working on the current checkout
* change it to work with create_distro_tarball, which was already opensourced
* make it build openssl 1.0.2 if needed
6488526
@jeffkaufman
Member

Backported to branch 34 as 6488526

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment