Skip to content
This repository has been archived by the owner on Oct 19, 2023. It is now read-only.

Allow versions like 3.5.0.1 for extension debian packages #397

Merged
merged 3 commits into from
Dec 11, 2017

Conversation

tmatsuo
Copy link
Contributor

@tmatsuo tmatsuo commented Dec 11, 2017

No description provided.

@@ -47,7 +47,7 @@ download_from_pecl()
with_retry "pecl download ${PECL_PACKAGE_NAME}" 6
# determine the downloaded version
EXT_VERSION=$(ls ${PACKAGE_SHORT_NAME}-*.tgz | \
sed "s/${PACKAGE_SHORT_NAME}-\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\)\.tgz/\1/")
sed -E "s/${PACKAGE_SHORT_NAME}-([0-9]+.[0-9]+(.[0-9]+)+).tgz/\1/")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to keep the escaping for the "." characters?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, done

@tmatsuo
Copy link
Contributor Author

tmatsuo commented Dec 11, 2017

Just in case I'm running the package builder locally. I'll merge once it builds correct packages

@tmatsuo
Copy link
Contributor Author

tmatsuo commented Dec 11, 2017

Now it's failing on opencensus-0.1.0RC1.tgz

@chingor13
Copy link
Member

chingor13 commented Dec 11, 2017

Doh, I uploaded a devel version of opencensus to ensure the build works. 0.1.0 will be tagged alpha and will be downloadable via pecl download opencensus-alpha.

In any case, we should probably make the version string even more lenient. Perhaps simply:

sed -E "s/${PACKAGE_SHORT_NAME}-(.*)\.tgz/\1/")

@tmatsuo
Copy link
Contributor Author

tmatsuo commented Dec 11, 2017

Yeah I'm thinking to allow any postfix string

@tmatsuo
Copy link
Contributor Author

tmatsuo commented Dec 11, 2017

It builds correct packages including

  • gcp-php72-opencensus_0.1.0RC1-7.2.0-2_amd64.deb
  • gcp-php72-protobuf_3.5.0.1-7.2.0-2_amd64.deb

@tmatsuo tmatsuo merged commit 5b174ad into master Dec 11, 2017
@tmatsuo tmatsuo deleted the deb-package-fix branch December 11, 2017 23:04
frost-byte pushed a commit to Wiser-Owl/php-docker that referenced this pull request May 9, 2021
…dPlatform#397)

* Allow versions like 3.5.0.1 for extension debian packages

* Escape dots in the regex

* Allow any additional string in the version part
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants