fix: workflow

jjoshm · Sep 17, 2021 · 5506690 · 5506690
1 parent fe8096f
commit 5506690
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/ci/github-actions/build.sh b/ci/github-actions/build.sh
@@ -40,9 +40,9 @@ for BINARY in $BINARIES; do
   if [ -x "./build.sh" ]; then
     OUTPUT=$(./build.sh "${CMD_PATH}" "${OUTPUT_DIR}")
   else
-    rustup target add x86_64-unknown-linux-musl
-    OPENSSL_LIB_DIR=/usr/lib/x86_64-linux-gnu OPENSSL_INCLUDE_DIR=/usr/include/openssl cargo build --release --target x86_64-unknown-linux-musl --bin "$BINARY"
-    OUTPUT=$(find "target/x86_64-unknown-linux-musl/release/" -maxdepth 1 -type f -executable \( -name "${BINARY}" -o -name "${BINARY}.*" \) -print0 | xargs -0)
+    rustup target add x86_64-unknown-linux-gnu
+    cargo build --release --target x86_64-unknown-linux-gnu --bin "$BINARY"
+    OUTPUT=$(find "target/x86_64-unknown-linux-gnu/release/" -maxdepth 1 -type f -executable \( -name "${BINARY}" -o -name "${BINARY}.*" \) -print0 | xargs -0)
   fi
 
   info "$OUTPUT"

diff --git a/ci/github-actions/entrypoint.sh b/ci/github-actions/entrypoint.sh
@@ -29,7 +29,7 @@ fi
 UPLOAD_URL=${UPLOAD_URL/\{?name,label\}/}
 RELEASE_NAME=$(echo "$EVENT_DATA" | jq -r .release.tag_name)
 PROJECT_NAME=$(basename "$GITHUB_REPOSITORY")
-NAME="${NAME:-${PROJECT_NAME}_${RELEASE_NAME}}_x86_64-unknown-linux-musl"
+NAME="${NAME:-${PROJECT_NAME}_${RELEASE_NAME}}_x86_64-unknown-linux-gnu"
 ARCHIVE_TYPES="${ARCHIVE_TYPES:-"tar.xz"}"
 EXTRA_FILES="${EXTRA_FILES:-""}"
 

diff --git a/ci/github-actions/generate-pkgbuild.py b/ci/github-actions/generate-pkgbuild.py
@@ -7,7 +7,7 @@
 try:
   tag = os.environ.get("tag_name")
   raw_version = tag.replace('v', '')
-  sha265sum_url = f"https://github.com/joshmuente/nightwaveplaza-tui/releases/download/{tag}/nightwaveplaza-tui_{tag}_x86_64-unknown-linux-musl.tar.xz.sha256sum"
+  sha265sum_url = f"https://github.com/joshmuente/nightwaveplaza-tui/releases/download/{tag}/nightwaveplaza-tui_{tag}_x86_64-unknown-linux-gnu.xz.sha256sum"
   sha265sum = requests.get(sha265sum_url).content.decode("utf-8")
 
   template = """#Maintainer: Josh Münte
@@ -24,7 +24,7 @@
 depends=()
 provides=("${_pkgname}")
 conflicts=("${_pkgname}")
-source=("${_url_source}/releases/download/v${pkgver}/${_pkgname}_v${pkgver}_${arch}-unknown-linux-musl.tar.xz")
+source=("${_url_source}/releases/download/v${pkgver}/${_pkgname}_v${pkgver}_${arch}-unknown-linux-gnu.xz")
 sha256sums=('"""+ sha265sum +"""')
 
 package () {