forked from curl/curl
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
8 changed files
with
106 additions
and
110 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| name: builder | ||
|
|
||
| on: | ||
| workflow_dispatch: | ||
| push: | ||
| schedule: | ||
| - cron: '30 5 * * *' | ||
|
|
||
| jobs: | ||
| build: | ||
| runs-on: ubuntu-24.04 | ||
| steps: | ||
| - name: Check out the repo | ||
| uses: actions/checkout@v4 | ||
| with: | ||
| fetch-depth: 0 | ||
|
|
||
| - name: merge upstream | ||
| run: | | ||
| git remote add upstream https://github.com/curl/curl.git | ||
| git fetch upstream | ||
| git -c user.name=Github -c user.email=none merge upstream/master | ||
| - name: Cache ccache | ||
| uses: actions/cache@v3 | ||
| with: | ||
| path: /home/runner/.cache/ccache | ||
| key: ccache | ||
|
|
||
| - name: Prepare build environment | ||
| run: | | ||
| sudo DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends sbuild mmdebstrap debian-archive-keyring ccache uidmap | ||
| mkdir -p "$HOME/.cache/sbuild" | ||
| mmdebstrap --variant=buildd --include=apt,ccache,ca-certificates \ | ||
| --keyring=/usr/share/keyrings/debian-archive-keyring.gpg \ | ||
| --customize-hook='chroot "$1" update-ccache-symlinks' \ | ||
| testing "$HOME/.cache/sbuild/testing-amd64.tar" | ||
| ccache --zero-stats --max-size=10.0G | ||
| chmod a+X "$HOME" "$HOME/.cache" | ||
| chmod -R a+rwX "$HOME/.cache/ccache" | ||
| cat << "EOF" > "$HOME/.sbuildrc" | ||
| $build_environment = { "CCACHE_DIR" => "/build/ccache" }; | ||
| $path = "/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games"; | ||
| $build_path = "/build/package/"; | ||
| $dsc_dir = "package"; | ||
| $unshare_bind_mounts = [ { directory => "$HOME/.cache/ccache", mountpoint => "/build/ccache" } ]; | ||
| $verbose = 1; | ||
| EOF | ||
| mkdir "$HOME/apt_repo" | ||
| - name: Run sbuild | ||
| run: | | ||
| sed -i "1 s/([^)]*)/($(git describe --tags | sed 's/^[^0-9]*//;s/-/./g;s/_/./g')-$(date -u '+%Y%m%d.%H%M%S%N'))/" debian/changelog | ||
| sbuild -d testing --chroot-mode=unshare --no-clean-source --no-run-lintian \ | ||
| --extra-repository="deb [trusted=yes] https://github.com/defo-project/openssl/raw/packages/ ./" \ | ||
| --dpkg-source-opts="-Zgzip -z1 --format=1.0 -sn" --build-dir="$HOME/apt_repo" | ||
| cd "$HOME/apt_repo" | ||
| apt-ftparchive packages . > Packages | ||
| apt-ftparchive release . > Release | ||
| - name: Test packages | ||
| run: | | ||
| mmdebstrap --chrooted-customize-hook="curl --ech true --doh-url 'https://1.1.1.1/dns-query' 'https://defo.ie/ech-check.php' | grep 'SSL_ECH_STATUS: success'" \ | ||
| --variant=essential --include=ca-certificates,curl testing /dev/null \ | ||
| "deb [signed-by=/usr/share/keyrings/debian-archive-keyring.gpg] http://deb.debian.org/debian testing main" \ | ||
| "deb [trusted=yes] https://github.com/defo-project/openssl/raw/packages/ /" \ | ||
| "deb [trusted=yes] copy:/$HOME/apt_repo /" | ||
| - name: Upload apt repository | ||
| run: | | ||
| cd "$HOME/apt_repo" | ||
| BRANCH=packages | ||
| REPOSITORY="$(printf "%s" "$GITHUB_REPOSITORY" | tr / _)" | ||
| echo "echo \"deb [trusted=yes] $GITHUB_SERVER_URL/$GITHUB_REPOSITORY/raw/$BRANCH/ /\" | sudo tee /etc/apt/sources.list.d/$REPOSITORY.list" >> README.md | ||
| git init -b "$BRANCH" | ||
| git remote add origin "$(echo "$GITHUB_SERVER_URL/$GITHUB_REPOSITORY.git" | sed "s#https://#https://x-access-token:${{ secrets.GITHUB_TOKEN }}@#")" | ||
| git add . | ||
| git -c user.name=Github -c user.email=none commit --message="Generated with $GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" | ||
| git push --force origin "$BRANCH" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,9 @@ | ||
| curl (8.8.0-1.1) UNRELEASED; urgency=medium | ||
|
|
||
| * Enable ECH | ||
|
|
||
| -- Jochen Sprickerhof <[email protected]> Thu, 27 Jun 2024 20:32:01 +0200 | ||
|
|
||
| curl (8.8.0-1) unstable; urgency=medium | ||
|
|
||
| * New upstream version 8.8.0 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,10 +28,10 @@ Signed-off-by: Simon McVittie <[email protected]> | |
| 1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
|
||
| diff --git a/curl-config.in b/curl-config.in | ||
| index d90bfbc..6b7cccd 100644 | ||
| index 44f3b0a..6b8d455 100644 | ||
| --- a/curl-config.in | ||
| +++ b/curl-config.in | ||
| @@ -161,7 +161,7 @@ while test "$#" -gt 0; do | ||
| @@ -163,7 +163,7 @@ while test "$#" -gt 0; do | ||
|
|
||
| --static-libs) | ||
| if test "X@ENABLE_STATIC@" != "Xno" ; then | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,10 +17,10 @@ Signed-off-by: Simon McVittie <[email protected]> | |
| 1 file changed, 2 insertions(+), 1 deletion(-) | ||
|
|
||
| diff --git a/configure.ac b/configure.ac | ||
| index a4ea9f7..cbbd11e 100644 | ||
| index 291484b..247205c 100644 | ||
| --- a/configure.ac | ||
| +++ b/configure.ac | ||
| @@ -1920,7 +1920,8 @@ if test x"$want_gss" = xyes; then | ||
| @@ -1924,7 +1924,8 @@ if test x"$want_gss" = xyes; then | ||
| gss_libs=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --libs gssapi` | ||
| LIBS="$gss_libs $LIBS" | ||
| elif test "$PKGCONFIG" != "no" ; then | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters