Merge pull request #303 from kjsanger/chore/tidy-build

Remove a redundant variable and add comments

.github/workflows/create-release.yml

@@ -28,15 +28,17 @@ jobs:
           
           git fetch --tags --force
 
-      - name: "Build Package"
+      - name: "Build source package"
         uses: wtsi-npg/[email protected]
         with:
           build-image:
+            # The image choice is somewhat flexible because this is creating a source package.
+            # The choice below favours being close to the current production environment.
             ghcr.io/wtsi-npg/ub-18.04-irods-clients-dev-4.2.11:latest
           build-script:
             ./.github/workflows/build-release.sh
 
-      - name: "Upload artifacts"
+      - name: "Upload source package"
         uses: actions/upload-artifact@v4
         with:
           name: baton-release-tarball
@@ -70,12 +72,12 @@ jobs:
           echo 'RELEASE_VERSION='$(git describe --always --tags) >> $GITHUB_ENV
           echo 'MASTER_SHA='$(git rev-parse origin/master) >> $GITHUB_ENV
 
-      - name: "Download artifact"
+      - name: "Download source package"
         uses: actions/download-artifact@v4
         with:
           name: baton-release-tarball
 
-      - name: "Create Release"
+      - name: "Create GitHub release"
         uses: ncipollo/[email protected]
         with:
           name: ${{ env.RELEASE_VERSION }}

release/Makefile

@@ -37,7 +37,6 @@ ub-16.04-baton-irods-4.2.7.$(TAG): ubuntu/16.04/Dockerfile
 	--build-arg DOCKER_IMAGE=$(subst .$(TAG),,$@) \
 	--build-arg DOCKER_TAG=$(TAG) \
 	--build-arg IRODS_VERSION="4.2.7" \
-	--build-arg BATON_VERSION=$(BATON_VERSION) \
 	--label org.opencontainers.image.title="iRODS 4.2.7 baton client, Ubuntu 16.04" \
 	--label org.opencontainers.image.source=$(git_url) \
 	--label org.opencontainers.image.revision=$(git_commit) \
@@ -56,7 +55,6 @@ ub-18.04-baton-irods-4.2.11.$(TAG): ubuntu/18.04/Dockerfile
 	--build-arg DOCKER_IMAGE=$(subst .$(TAG),,$@) \
 	--build-arg DOCKER_TAG=$(TAG) \
 	--build-arg IRODS_VERSION="4.2.11" \
-	--build-arg BATON_VERSION=$(BATON_VERSION) \
 	--label org.opencontainers.image.title="iRODS 4.2.11 baton client, Ubuntu 18.04" \
 	--label org.opencontainers.image.source=$(git_url) \
 	--label org.opencontainers.image.revision=$(git_commit) \
@@ -75,7 +73,6 @@ ub-18.04-baton-irods-4.2.12.$(TAG): ubuntu/18.04/Dockerfile
 	--build-arg DOCKER_IMAGE=$(subst .$(TAG),,$@) \
 	--build-arg DOCKER_TAG=$(TAG) \
 	--build-arg IRODS_VERSION="4.2.12" \
-	--build-arg BATON_VERSION=$(BATON_VERSION) \
 	--label org.opencontainers.image.title="iRODS 4.2.12 baton client, Ubuntu 18.04" \
 	--label org.opencontainers.image.source=$(git_url) \
 	--label org.opencontainers.image.revision=$(git_commit) \
@@ -94,7 +91,6 @@ ub-22.04-baton-irods-4.3.2.$(TAG): ubuntu/22.04/Dockerfile
 	--build-arg DOCKER_IMAGE=$(subst .$(TAG),,$@) \
 	--build-arg DOCKER_TAG=$(TAG) \
 	--build-arg IRODS_VERSION="4.3.2" \
-	--build-arg BATON_VERSION=$(BATON_VERSION) \
 	--label org.opencontainers.image.title="iRODS 4.3.2 baton client, Ubuntu 22.04" \
 	--label org.opencontainers.image.source=$(git_url) \
 	--label org.opencontainers.image.revision=$(git_commit) \
@@ -113,7 +109,6 @@ ub-22.04-baton-irods-4.3.3.$(TAG): ubuntu/22.04/Dockerfile
 	--build-arg DOCKER_IMAGE=$(subst .$(TAG),,$@) \
 	--build-arg DOCKER_TAG=$(TAG) \
 	--build-arg IRODS_VERSION="4.3.3" \
-	--build-arg BATON_VERSION=$(BATON_VERSION) \
 	--label org.opencontainers.image.title="iRODS 4.3.3 baton client, Ubuntu 22.04" \
 	--label org.opencontainers.image.source=$(git_url) \
 	--label org.opencontainers.image.revision=$(git_commit) \