Run of fresh-snapshots for caml-crush

Merge these changes:

git pull https://janitor.debian.net/git/caml-crush fresh-snapshots/main
git pull https://janitor.debian.net/git/caml-crush fresh-snapshots/upstream

Summary

Merged new upstream version: 1.0.12+git20211202.1.dd6a6b0 (was: 1.0.12).

Diff

Branch: main

diff --git a/.github/build-pkg-git.sh b/.github/build-pkg-git.sh
new file mode 100755
index 0000000..ff8b0ab
--- /dev/null
+++ b/.github/build-pkg-git.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+#set parameters needed for gbp import
+git config --global user.email "calderon.thomas@gmail"
+git config --global user.name "Thomas Calderon"
+
+echo Generating package for $BRANCH_NAME, will output in $DEB_OUTPUT_CONTAINER
+
+COMMIT_SHORT=1.0.x-$(git rev-parse --short HEAD)
+git archive --format=tar.gz --prefix=caml-crush-$COMMIT_SHORT/ HEAD > ../caml-crush-$COMMIT_SHORT.tar.gz
+
+#Track needed branches
+git checkout --track origin/upstream
+git checkout --track origin/debian
+
+gbp import-orig --debian-branch=debian -u $COMMIT_SHORT ../caml-crush-$COMMIT_SHORT.tar.gz
+
+COMMIT_TS=$(git show -s --pretty=format:%ct HEAD)
+COMMIT_DATE=$(date --date="@${COMMIT_TS}" +%Y%m%d%H%M)
+GBP_SINCE_PARAM="--auto"
+export DEBEMAIL="calderon.thomas@gmail.com"
+export DEBFULLNAME="Thomas Calderon"
+gbp dch $GBP_SINCE_PARAM --snapshot --snapshot-number="${COMMIT_DATE}" --no-multimaint --ignore-branch
+
+gbp buildpackage -uc -us --git-no-sign-tags --git-debian-branch=debian --git-ignore-new
+
+#copy all artefacts in output directory
+mv ../caml-crush* $DEB_OUTPUT_CONTAINER/
\ No newline at end of file
diff --git a/.github/build-pkg.sh b/.github/build-pkg.sh
new file mode 100755
index 0000000..5f8c8b0
--- /dev/null
+++ b/.github/build-pkg.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+OUTPUT=/tmp/output
+
+git checkout debian
+gbp buildpackage -uc -us -S --git-no-sign-tags --git-debian-branch=debian --git-ignore-new --git-export-dir=$OUTPUT
+
+# Build AMD64 package
+#docker run --rm -it -e DEB_BUILD_OPTIONS='parallel=1' -v ${OUTPUT}:/tmp/output  caml-crush-pkgsid gbp buildpackage -uc -us --git-no-sign-tags --git-debian-branch=debian --git-ignore-new --git-export-dir=/tmp/output
\ No newline at end of file
diff --git a/.github/workflows/debian-packaging.yml b/.github/workflows/debian-packaging.yml
new file mode 100644
index 0000000..19a21a2
--- /dev/null
+++ b/.github/workflows/debian-packaging.yml
@@ -0,0 +1,85 @@
+name: Debian
+on: push
+env:
+  CHANGELOG_AUTHOR_NAME: "Thomas Calderon"
+  CHANGELOG_AUTHOR_EMAIL: "calderon.thomas@gmail.com"
+  DEB_OUTPUT: "/tmp/cc-output"
+  DEB_OUTPUT_CONTAINER: "/tmp/output"
+
+jobs:
+  build-debian-package:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+       include:
+         - dist: "debian"
+           flavor: "sid"
+        #  - dist: "debian"
+        #    flavor: "testing"
+        #  - dist: "debian"
+        #    flavor: "bullseye"
+        #  - dist: "debian"
+        #    flavor: "buster"
+        # #  Ubuntu Focal does not have coccinelle package, skip for now
+        # #  - dist: "ubuntu"
+        # #    flavor: "focal"
+        #  - dist: "ubuntu"
+        #    flavor: "bionic"
+        #  - dist: "ubuntu"
+        #    flavor: "xenial"
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+    - name: Get branch name (merge)
+      if: github.event_name != 'pull_request'
+      shell: bash
+      run: echo "BRANCH_NAME=$(echo ${GITHUB_REF#refs/heads/} | tr / -)" >> $GITHUB_ENV
+
+    - name: Get branch name (pull request)
+      if: github.event_name == 'pull_request'
+      shell: bash
+      run: echo "BRANCH_NAME=$(echo ${GITHUB_HEAD_REF} | tr / -)" >> $GITHUB_ENV
+    - name: Show branch detail
+      shell: bash
+      run: echo "echo ${BRANCH_NAME}"
+    - name: build docker container to build
+      env:
+          DIST: ${{ matrix.dist }}
+          FLAVOR: ${{ matrix.flavor }}
+      run: |
+        curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
+        sudo add-apt-repository \
+          "deb https://download.docker.com/linux/ubuntu \
+          $(lsb_release -cs) \
+          stable"
+        sudo apt-get update
+        sudo apt-get install -y --no-install-recommends docker-ce
+        docker build -t caml-crush-pkg-${FLAVOR} \
+          --build-arg flavor=${DIST} \
+          --build-arg flavor=${FLAVOR} \
+           -f Dockerfile.debian-pkg .
+    # - name: Setup tmate session
+    #   uses: mxschmitt/action-tmate@v3
+    - name: build package in container
+      env:
+          DIST: ${{ matrix.dist }}
+          FLAVOR: ${{ matrix.flavor }}
+          BRANCH_NAME: ${{ env.BRANCH_NAME }}
+          DEB_OUTPUT: ${{ env.DEB_OUTPUT }}
+          DEB_OUTPUT_CONTAINER: ${{ env.DEB_OUTPUT_CONTAINER }}
+      run: |
+        mkdir -p ${DEB_OUTPUT}
+        docker run --rm \
+          -e BRANCH_NAME=${BRANCH_NAME} \
+          -e DEB_OUTPUT_CONTAINER=${DEB_OUTPUT_CONTAINER} \
+          -v ${DEB_OUTPUT}:${DEB_OUTPUT_CONTAINER} \
+          caml-crush-pkg-${FLAVOR} \
+          bash -x .github/build-pkg-git.sh
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v2
+      with:
+        name: deb
+        path: ${{env.DEB_OUTPUT}}/
+        if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn` 
diff --git a/Dockerfile.debian-pkg b/Dockerfile.debian-pkg
new file mode 100644
index 0000000..1d136aa
--- /dev/null
+++ b/Dockerfile.debian-pkg
@@ -0,0 +1,28 @@
+# Override with --build-arg dist=ubuntu --build-arg flavor=bionic
+ARG dist=debian
+ARG flavor=sid
+
+FROM ${dist}:${flavor} as builder
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update
+RUN apt-get -y upgrade
+RUN apt-get install -y --no-install-recommends autoconf make gcc \
+                     automake autotools-dev \
+                     ocaml-nox camlidl coccinelle \
+                     libocamlnet-ocaml-dev libocamlnet-ocaml-bin \
+                     libocamlnet-ssl-ocaml libocamlnet-ssl-ocaml-dev \
+                     libssl-dev gnutls-dev \
+                     libconfig-file-ocaml-dev camlp4 \
+                     git-buildpackage debhelper \
+                     dh-exec dh-autoreconf build-essential
+
+RUN apt-get install -y --no-install-recommends ca-certificates fakeroot debhelper
+
+FROM builder
+
+WORKDIR /build/git
+COPY . .
+
+RUN mkdir /tmp/output
diff --git a/debian/changelog b/debian/changelog
index 609b6d6..5b90c07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+caml-crush (1.0.12+git20211202.1.dd6a6b0-1) UNRELEASED; urgency=low
+
+  * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Tue, 19 Apr 2022 21:43:13 -0000
+
 caml-crush (1.0.12-1) unstable; urgency=medium
 
   * Fix makefile bugs

Branch: upstream

Tag: upstream/1.0.12+git20211202.1.dd6a6b0

Diff is too long (more than 200 lines). Download the raw diff.

Publish Blockers

  • ☑ run was successful
  • ☑ package has not been removed from the archive
  • ☑ command has not changed
  • ☒ not yet reviewed, but review needed
  • ☑ 0 publish attempts so far.not currently attempting to back off
  • ☒ merge proposals for the package maintainer are currently being rate-limited (open: 1383, max open: 300)
  • ☑ change set d14eb36a-5341-4cc4-a5c4-4aefff799b49 is ready

Resulting package

The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:

apt install -t fresh-snapshots caml-crush-clients-dbgsymapt install -t fresh-snapshots caml-crush-clientsapt install -t fresh-snapshots caml-crush-server-dbgsymapt install -t fresh-snapshots caml-crush-server

Lintian Result

Full worker log Full build log