Avoid the use of build args and try to correct for upload-artifact be…

…havior
WombatFromHell · Jan 3, 2025 · 6345655 · 6345655
1 parent e5c98b2
commit 6345655
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 14 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -26,10 +26,9 @@ jobs:
           chmod +x ./build.sh
           export CI=${{ env.CI }}
           ./build.sh
-          cd ./target/appimage
 
       - name: Upload Binary
         uses: actions/upload-artifact@v4
         with:
           name: veridian-controller
-          path: veridian-controller_${{ steps.get_version.outputs.VERSION }}.tar.gz
+          path: ./target/appimage/veridian-controller_${{ steps.get_version.outputs.VERSION }}.tar.gz*
diff --git a/Dockerfile b/Dockerfile
@@ -10,7 +10,4 @@ RUN wget https://github.com/AppImage/AppImageKit/releases/download/continuous/ap
 WORKDIR /app
 COPY . /app/
 
-ARG CI
-ENV CI=$CI
-
 ENTRYPOINT [ "/app/entrypoint.sh" ]
diff --git a/build.sh b/build.sh
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 
-CI="${CI:-false}"
 IMAGE_NAME="veridian"
 
 selinux_status() {
@@ -23,7 +22,7 @@ fi
 rm -rf ./target/appimage &&
 	mkdir -p ./target
 
-docker build --build-arg CI="$CI" -t $IMAGE_NAME .
+docker build -t $IMAGE_NAME .
 docker run --rm \
 	-v "./target:/app/target${RELABEL}" \
 	--name $IMAGE_NAME $IMAGE_NAME
diff --git a/entrypoint.sh b/entrypoint.sh
@@ -21,10 +21,8 @@ echo "" && echo "AppImage release build created at: \"${full_versioned_path}\""
 cd /app/target/appimage || exit
 sha256sum "${versioned_path}" >"${versioned_path}.sha256"
 
-if [[ "$CI" == false ]]; then
-	# package only when CI=false
-	mkdir -p /app/target/appimage/"${artifact_name}_${VERSION}"
-	cp -f /app/{LICENSE.md,README.md,nvidia-settings.sudoers,veridian-controller.service} /app/target/appimage/*.* ./"${artifact_name}_${VERSION}"
-	tar -cvzf veridian-controller_"${VERSION}".tar.gz ./"${artifact_name}_${VERSION}"
-	echo "" && echo "Release archive created at: \"${artifact_name_path}/${artifact_name}_${VERSION}.tar.gz\""
-fi
+mkdir -p /app/target/appimage/"${artifact_name}_${VERSION}"
+cp -f /app/{LICENSE.md,README.md,nvidia-settings.sudoers,veridian-controller.service} /app/target/appimage/*.* ./"${artifact_name}_${VERSION}"
+tar -cvzf veridian-controller_"${VERSION}".tar.gz ./"${artifact_name}_${VERSION}"
+sha256sum ./"${artifact_name}_${VERSION}.tar.gz" >"${artifact_name}_${VERSION}.tar.gz.sha256"
+echo "" && echo "Release archive created at: \"${artifact_name_path}\""