Merge pull request #795 from heroku/post-heroku-20-cleanups

Post-heroku-20 cleanups

Author: dzuelke

.github/workflows/ci.yml

@@ -22,8 +22,6 @@ env:
   HATCHET_BUILDPACK_BRANCH: ${{ github.head_ref || github.ref_name }}
   HEROKU_API_KEY: ${{ secrets.HEROKU_API_KEY }}
   HEROKU_API_USER: ${{ secrets.HEROKU_API_USER }}
-  S5CMD_VERSION: 2.2.2
-  S5CMD_HASH: "392c385320cd5ffa435759a95af77c215553d967e4b1c0fffe52e4f14c29cf85  s5cmd_2.2.2_linux_amd64.deb"
 
 jobs:
   integration-test:
@@ -50,16 +48,13 @@ jobs:
         with:
           php-version: "8.3"
           tools: "composer:2.8"
-      - name: Install packages from requirements.txt, plus s5cmd (for some tests)
+      - name: Install packages from requirements.txt (for some tests in platform_spec.rb that run mkrepo.sh which needs natsort)
         run: |
           export VIRTUAL_ENV=$HOME/.venv
           python3 -m venv "$VIRTUAL_ENV"
           export PATH=$VIRTUAL_ENV/bin:$PATH
           pip install -r requirements.txt
-          curl -sSLO https://github.com/peak/s5cmd/releases/download/v${S5CMD_VERSION}/s5cmd_${S5CMD_VERSION}_linux_amd64.deb
-          echo "$S5CMD_HASH" | shasum -c -
-          dpkg -x "s5cmd_${S5CMD_VERSION}_linux_amd64.deb" .
-          echo "$HOME/usr/bin:$VIRTUAL_ENV/bin" >> "$GITHUB_PATH"
+          echo "$VIRTUAL_ENV/bin" >> "$GITHUB_PATH"
       - name: Hatchet setup
         run: bundle exec hatchet ci:setup
       - name: Export HEROKU_PHP_PLATFORM_REPOSITORIES to …${{env.src_path_suffix}} (since we are not building main or a tag)

support/build/extensions/no-debug-non-zts-20210902/amqp

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+dep_name=$(basename $BASH_SOURCE)
+
 # let's see if librabbitmq is there
 needed=( librabbitmq4 )
 missing=$(comm -1 -3 <(dpkg-query -W -f '${package}\n' | sort) <(IFS=$'\n'; echo "${needed[*]}" | sort))
@@ -15,6 +17,4 @@ if [[ "$missing" ]]; then
 	apt-get install -q -y $missing
 fi
 
-dep_name=$(basename $BASH_SOURCE)
-
 source $(dirname $BASH_SOURCE)/../pecl

support/build/extensions/no-debug-non-zts-20210902/apcu

@@ -1,64 +1,5 @@
 #!/usr/bin/env bash
 
-# fail hard
-set -o pipefail
-# fail harder
-set -eu
-
-source $(dirname $BASH_SOURCE)/../../_util/include/manifest.sh
-
-OUT_PREFIX=$1
-
-export PATH=${OUT_PREFIX}/bin:${PATH}
-
-dep_formula=${0#$WORKSPACE_DIR/}
 dep_name=$(basename $BASH_SOURCE)
-dep_version=${dep_formula##*"/${dep_name}-"}
-dep_package=ext-${dep_name}-${dep_version}
-dep_dirname=${dep_name}-${dep_version}
-dep_archive_name=${dep_dirname}.tgz
-dep_url=https://pecl.php.net/get/${dep_archive_name}
-series=$(php-config --version | cut -d. -f1,2) # get "7.3", "7.4", "8.0" etc for the php requirement in the manifest
-dep_manifest=${dep_package}_php-$series.composer.json
-
-echo "-----> Building ${dep_package} (from PECL)..."
-
-curl -L ${dep_url} | tar xz
-
-pushd ${dep_dirname}
-phpize
-./configure \
-	--prefix=${OUT_PREFIX} \
-	${CONFIGURE_EXTRA:-}
-make -s -j $(($(nproc)+1))
-
-# php was a build dep, and it's in $OUT_PREFIX; we only want our build results in the final archive, and no build deps
-# the easiest way is to nuke $OUT_PREFIX and running "make install", but extensions built for PHP 8.1+ need PHP headers during linking
-# so instead we use the extension Makefile's INSTALL_ROOT variable to prefix the install destination path name, and then move that back to $OUT_PREFIX
-tmpdest=$(mktemp -d)
-
-# install apcu ext
-echo "-----> Installing into clean ${tmpdest}..."
-make INSTALL_ROOT=$tmpdest install -s
-echo "-----> Moving install result from ${tmpdest}${OUT_PREFIX} to $OUT_PREFIX..."
-rm -rf $OUT_PREFIX # remove $OUT_PREFIX first (otherwise we'd move things *into* it)
-mv ${tmpdest}${OUT_PREFIX} $OUT_PREFIX # move from /tmp/foobarz/app/.heroku/php to /app/.heroku/php
-popd
-
-mkdir -p ${OUT_PREFIX}/etc/php/conf.d
-cat > ${OUT_PREFIX}/etc/php/conf.d/apcu.ini-dist <<'EOF'
-extension=apcu.so
-EOF
-
-# cleanup
-strip --strip-unneeded ${OUT_PREFIX}/lib/php/extensions/*/*.so
-
-MANIFEST_REQUIRE="${MANIFEST_REQUIRE:-"{\"heroku-sys/php\":\"${series}.*\"}"}"
-MANIFEST_CONFLICT="${MANIFEST_CONFLICT:-"{}"}"
-MANIFEST_REPLACE="${MANIFEST_REPLACE:-"{}"}"
-MANIFEST_PROVIDE="${MANIFEST_PROVIDE:-"{}"}"
-MANIFEST_EXTRA="${MANIFEST_EXTRA:-"{\"config\":\"etc/php/conf.d/apcu.ini-dist\"}"}"
-
-python $(dirname $BASH_SOURCE)/../../_util/include/manifest.py "heroku-sys-php-extension" "heroku-sys/ext-${dep_name}" "$dep_version" "${dep_formula}.tar.gz" "$MANIFEST_REQUIRE" "$MANIFEST_CONFLICT" "$MANIFEST_REPLACE" "$MANIFEST_PROVIDE" "$MANIFEST_EXTRA" > $dep_manifest
 
-print_or_export_manifest_cmd "$(generate_manifest_cmd "$dep_manifest")"
+source $(dirname $BASH_SOURCE)/../pecl

support/build/extensions/no-debug-non-zts-20210902/memcached

@@ -3,7 +3,6 @@
 dep_name=$(basename $BASH_SOURCE)
 
 OUT_PREFIX=$1
-export PATH=${OUT_PREFIX}/bin:${PATH}
 
 # can't build without this
 needed=( libsasl2-2 )

support/build/extensions/no-debug-non-zts-20210902/oauth

@@ -2,9 +2,4 @@
 
 dep_name=$(basename $BASH_SOURCE)
 
-# ext-oauth <=2.0.7 configure checks for this, but does not actually link against libpcre3
-# https://github.com/php/pecl-web_services-oauth/commit/2e02631fa424639b10d105ff47e9cf650403cef7
-# https://github.com/php/pecl-web_services-oauth/issues/28
-touch /usr/include/pcre.h
-
 source $(dirname $BASH_SOURCE)/../pecl

support/build/extensions/no-debug-non-zts-20210902/phalcon

@@ -1,55 +1,5 @@
 #!/usr/bin/env bash
 
-# fail hard
-set -o pipefail
-# fail harder
-set -eu
-
-source $(dirname $BASH_SOURCE)/../../_util/include/manifest.sh
-
-OUT_PREFIX=$1
-
-export PATH=${OUT_PREFIX}/bin:${PATH}
-
-dep_formula=${0#$WORKSPACE_DIR/}
 dep_name=$(basename $BASH_SOURCE)
-dep_version=${dep_formula##*"/${dep_name}-"}
-dep_package=ext-${dep_name}-${dep_version}
-dep_dirname=phalcon-${dep_version}
-dep_url=releases/download/v${dep_version}/phalcon-pecl.tgz
-dep_url=https://github.com/phalcon/cphalcon/${dep_url}
-series=$(php-config --version | cut -d. -f1,2) # get "7.3", "7.4", "8.0" etc for the php requirement in the manifest
-dep_manifest=${dep_package}_php-$series.composer.json
-
-echo "-----> Building ${dep_package}..."
-
-curl -L ${dep_url} | tar xz
-
-pushd ${dep_dirname}
-phpize
-./configure \
-	--prefix=${OUT_PREFIX} \
-	${CONFIGURE_EXTRA:-}
-make -s -j $(($(nproc)+1))
-
-# php was a build dep, and it's in $OUT_PREFIX; we only want our build results in the final archive, and no build deps
-# the easiest way is to nuke $OUT_PREFIX and running "make install", but extensions built for PHP 8.1+ need PHP headers during linking
-# so instead we use the extension Makefile's INSTALL_ROOT variable to prefix the install destination path name, and then move that back to $OUT_PREFIX
-tmpdest=$(mktemp -d)
-echo "-----> Installing into clean ${tmpdest}..."
-make INSTALL_ROOT=$tmpdest install -s
-echo "-----> Moving install result from ${tmpdest}${OUT_PREFIX} to $OUT_PREFIX..."
-rm -rf $OUT_PREFIX # remove $OUT_PREFIX first (otherwise we'd move things *into* it)
-mv ${tmpdest}${OUT_PREFIX} $OUT_PREFIX # move from /tmp/foobarz/app/.heroku/php to /app/.heroku/php
-strip --strip-unneeded ${OUT_PREFIX}/lib/php/extensions/*/*.so
-popd
-
-MANIFEST_REQUIRE="${MANIFEST_REQUIRE:-"{\"heroku-sys/php\":\"${series}.*\"}"}"
-MANIFEST_CONFLICT="${MANIFEST_CONFLICT:-"{}"}"
-MANIFEST_REPLACE="${MANIFEST_REPLACE:-"{}"}"
-MANIFEST_PROVIDE="${MANIFEST_PROVIDE:-"{}"}"
-MANIFEST_EXTRA="${MANIFEST_EXTRA:-"{}"}"
-
-python $(dirname $BASH_SOURCE)/../../_util/include/manifest.py "heroku-sys-php-extension" "heroku-sys/ext-${dep_name}" "$dep_version" "${dep_formula}.tar.gz" "$MANIFEST_REQUIRE" "$MANIFEST_CONFLICT" "$MANIFEST_REPLACE" "$MANIFEST_PROVIDE" "$MANIFEST_EXTRA" > $dep_manifest
 
-print_or_export_manifest_cmd "$(generate_manifest_cmd "$dep_manifest")"
+source $(dirname $BASH_SOURCE)/../pecl

support/build/extensions/no-debug-non-zts-20210902/pq

@@ -9,8 +9,6 @@ export PATH=${OUT_PREFIX}/bin:${PATH}
 echo 'extension=raphf.so' > ${OUT_PREFIX}/etc/php/conf.d/raphf.ini
 
 # we need to declare the right version of raphf as required
-dep_formula=${0#$WORKSPACE_DIR/}
-dep_version=${dep_formula##*"/${dep_name}-"}
 series=$(php-config --version | cut -d. -f1,2) # get "7.3", "7.4", "8.0" etc for the php requirement in the manifest
 MANIFEST_REQUIRE="${MANIFEST_REQUIRE:-"{\"heroku-sys/php\":\"${series}.*\",\"heroku-sys/ext-raphf\":\">=2.0.0\",\"heroku-sys/ext-json\":\"*\",\"heroku-sys/ext-spl\":\"*\"}"}"
 

support/build/extensions/no-debug-non-zts-20210902/rdkafka

@@ -6,8 +6,6 @@ OUT_PREFIX=$1
 export PATH=${OUT_PREFIX}/bin:${PATH}
 
 # we need to declare the required version of librdkafka
-dep_formula=${0#$WORKSPACE_DIR/}
-dep_version=${dep_formula##*"/${dep_name}-"}
 series=$(php-config --version | cut -d. -f1,2) # get "7.3", "7.4", "8.0" etc for the php requirement in the manifest
 MANIFEST_REQUIRE="${MANIFEST_REQUIRE:-"{\"heroku-sys/php\":\"${series}.*\",\"heroku-sys/librdkafka\":\"^1.0.0 | ^2.0.0\",\"heroku-sys/librdkafka-abi\":\"^1\"}"}"
 

support/build/libraries/libcassandra

@@ -23,7 +23,7 @@
 			expected_markdown = File.read("#{devcenter_fixtures_subdir}/changelog/changelog.md")
 			# the expected markdown contains "%B %Y" strftime directives at the top
 			expected_markdown = Time.now.utc.strftime(expected_markdown)
-			expect(expected_markdown).to eq(generated_markdown)
+			expect(generated_markdown).to eq(expected_markdown)
 		end
 		it "produces a near-empty document if there are no additions" do
 			cmd = "cat #{devcenter_fixtures_subdir}/changelog/sync-nothingnew.log | #{devcenter_tooling_subdir}/changelog.php"
@@ -35,7 +35,7 @@
 			expected_markdown = File.read("#{devcenter_fixtures_subdir}/changelog/changelog-nothingnew.md")
 			# the expected markdown contains "%B %Y" strftime directives at the top
 			expected_markdown = Time.now.utc.strftime(expected_markdown)
-			expect(expected_markdown).to eq(generated_markdown)
+			expect(generated_markdown).to eq(expected_markdown)
 		end
 	end
 
@@ -48,7 +48,7 @@
 			expect(status.exitstatus).to eq(0), "generate.php exited with status #{status.exitstatus}; stderr: #{stderr}, stdout: #{stdout}"
 
 			expected_markdown = File.read("#{devcenter_fixtures_subdir}/generator/php-support.md")
-			expect(expected_markdown).to eq(generated_markdown)
+			expect(generated_markdown).to eq(expected_markdown)
 
 			expect(stderr).to include("NOTICE: whitelisted runtime series not found in input: 7.3")
 		end

support/build/libraries/libcassandra-2.16.0

@@ -156,7 +156,7 @@
 			end
 		end
 
-		describe "combined with a custom repository installs packages from that repo according to the priority given", :focused => true do
+		describe "combined with a custom repository installs packages from that repo according to the priority given" do
 			Dir.glob("composer-*.json", base: priorities_fixtures_subdir) do |testcase|
 				it "in case #{testcase}" do
 					Dir.chdir(priorities_fixtures_subdir) do |cwd|
@@ -206,13 +206,13 @@
 
 					cmd = "S3_BUCKET=OURS3BUCKET S3_PREFIX=OURS3PREFIX/ #{bp_root}/support/build/_util/mkrepo.sh *.composer.json"
 					stdout, stderr, status = Open3.capture3("bash -c #{Shellwords.escape(cmd)}")
-				
+					
 					expect(status.exitstatus).to eq(0), "mkrepo.sh failed, stdout: #{stdout}, stderr: #{stderr}"
-				
+					
 					expected_json = JSON.parse(File.read("expected_packages.json"))
 					generated_json = JSON.parse(stdout)
-				
-					expect(expected_json).to eq(generated_json)
+					
+					expect(generated_json).to eq(expected_json)
 				end
 			end
 		end