Alter changelog to indicate buildyymmddhhmmss

jsjgruber · Jun 25, 2022 · 3aa8f55 · 3aa8f55
1 parent 98e60fd
commit 3aa8f55
Showing 1 changed file with 18 additions and 2 deletions.
diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml
@@ -54,7 +54,7 @@ jobs:
       PACKAGENAME: ${{inputs.INPUTPACKAGENAME}}
       BUILDDEPENDENCIES: ${{inputs.INPUTBUILDDEPENDENCIES}}
 
-    # Steps represent a sequence of tasks that will be executed as part of the job
+# Below are the steps of this job
     steps:
     - name: Checkout repo
       uses: actions/checkout@v3
@@ -107,26 +107,38 @@ jobs:
         dch -R Github actions build from upstream
         echo debian/changelog -- 
         cat debian/changelog
+        sed -i '1s/)/~build`date -u +"%Y%m%d%H%M%S" `)/' debian/changelog
+        echo ----------- debian/changelog for this build -------------
+        cat debian/changelog
+
+        /usr/lib/pbuilder/pbuilder-satisfydepends --control debian/control
+
         dpkg-buildpackage -uc -us
+
         cp ./tuttut /results
+        
         echo "The container's /results contents"
         ls -la /results
+
         # Temporary test
         file ./tuttut
         ./tuttut
         EOF
 
+        # Make the build.bash file we created executible for the Docker run
         chmod +x build.bash
 
     - name: Create a Dockerfile and build an image
       run: |
+        docker image list $IMAGE
         cat  > Dockerfile <<EOF
         #   buildpack-deps for focal
         FROM $SOURCEIMAGE:$RELEASE AS $IMAGE
         ADD build.bash /build.bash
         RUN apt-get update
         # RUN apt-get install -y build-essential debhelper sudo less pbuilder vim man
-        RUN apt-get install -y build-essential debhelper devscripts $BUILDDEPENDENCIES
+        RUN apt-get install -y build-essential debhelper devscripts \
+         pbuilder aptitude $BUILDDEPENDENCIES
         RUN apt-get clean -y
         RUN mkdir -p /results/package
         WORKDIR /results/package
@@ -143,6 +155,10 @@ jobs:
         docker run --rm --privileged --mount type=bind,source=/home/runner/work/experiment/experiment/results,target=/results \
           --mount type=bind,source=/home/runner/work/experiment/experiment,target=/results/package \
           $IMAGE /build.bash
+    - name: Check images
+      run: docker image ls --all
+    - name: Check for our image
+      run: docker image ls $IMAGE
     - name: Upload results
       uses: actions/upload-artifact@v3
       with: