From 5ba20c9dba249fb5714cc68f79968f3d247c6cd5 Mon Sep 17 00:00:00 2001
From: Dedy Martadinata Supriyadi <dedyms@pm.me>
Date: Fri, 11 Feb 2022 18:23:00 +0000
Subject: [PATCH] Update .gitlab-ci.yml, server.package.json

---
 .gitlab-ci.yml      | 50 ++++++++-------------------------------------
 server.package.json |  6 +++---
 2 files changed, 11 insertions(+), 45 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4a90675..90d3d70 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,6 @@ variables:
   IMAGE_TAG_TEST: test
   DOCKER_CLI_EXPERIMENTAL: enabled
   PLATFORMS: "linux/amd64,linux/arm64,linux/arm/v7"
-  PLATFORMS_DOCKER: "linux/amd64,linux/arm64"
   PLATFORMS_TEST: "linux/amd64"
   PACKAGE_REGISTRY_URL: "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/deemix-docker/${CI_COMMIT_SHORT_SHA}"
   ZIP_NAME: "deemix-docker"
@@ -23,6 +22,7 @@ build-deemix:
     - cp server.package.json deemix-gui/server/package.json
     - cd deemix-gui
     - yarn config set network-timeout 1000000 -g
+    - yarn add pkg@latest
     - yarn install-all
     - yarn dist-server
     - ls -al dist/
@@ -30,46 +30,11 @@ build-deemix:
       curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file dist/deemix-server-x64 ${PACKAGE_REGISTRY_URL}/deemix-server-linux-amd64
     - |
       curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file dist/deemix-server-arm64 ${PACKAGE_REGISTRY_URL}/deemix-server-linux-arm64
+    - |
+      curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file dist/deemix-server-armv7 ${PACKAGE_REGISTRY_URL}/deemix-server-linux-arm
   only:
     refs:
       - master
-    changes:
-      - server.package.json
-  #artifacts:
-  #  paths:
-  #    - deemix-gui/
-
-
-#build-binary:
-#  image: docker:19
-#  stage: build-binary
-#  services:
-#    - docker:dind
-#  before_script:
-#    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-#    - apk add --update curl jq && rm -rf /var/cache/apk/*
-#    - export CI_JOB_TIMESTAMP=$(date --utc -Iseconds)
-#    - export DATE=$(date +%Y%m%d)
-#  script:
-#    # Download latest buildx bin from github
-#    - mkdir -p ~/.docker/cli-plugins/
-#    - BUILDX_LATEST_BIN_URI=$(curl -s -L https://github.com/docker/buildx/releases/latest | grep 'linux-amd64' | grep 'href' | sed 's/.*href="/https:\/\/github.com/g; s/amd64".*/amd64/g')
-#    - curl -s -L ${BUILDX_LATEST_BIN_URI} -o ~/.docker/cli-plugins/docker-buildx
-#    - chmod a+x ~/.docker/cli-plugins/docker-buildx
-    # Get and run the latest docker/binfmt tag to use its qemu parts
-#    - BINFMT_IMAGE_TAG=$(curl -s https://registry.hub.docker.com/v2/repositories/docker/binfmt/tags | jq '.results | sort_by(.last_updated)[-1].name' -r)
-#    - docker run --rm --privileged docker/binfmt:${BINFMT_IMAGE_TAG}
-#    # create the multibuilder
-#    - docker buildx create --name multibuilder
-#    - docker buildx use multibuilder    
-#    # build and push
-#    - docker buildx build --build-arg PACKAGE_REGISTRY_URL=${PACKAGE_REGISTRY_URL} --build-arg JOB_TOKEN=${CI_JOB_TOKEN} --platform "${PLATFORMS_TEST}" . -f Dockerfile.binary
-#    # Also can do using date, so we dont dependant on latest, in case application break again.
-#    #- docker buildx build --platform "${PLATFORMS}" -t ${CI_REGISTRY_IMAGE}:${DATE} -t $CI_REGISTRY_IMAGE:${IMAGE_TAG} . --push
-#  only:
-#    refs:
-#      - CI-test
-
 
 create-release:
   stage: create-release
@@ -81,10 +46,11 @@ create-release:
     - |
       release-cli create --name "Release $DATE" --tag-name $CI_COMMIT_SHA \
         --assets-link "{\"name\":\"deemix-server-linux-amd64\",\"url\":\"${PACKAGE_REGISTRY_URL}/deemix-server-linux-amd64\"}" \
-        --assets-link "{\"name\":\"deemix-server-linux-arm64\",\"url\":\"${PACKAGE_REGISTRY_URL}/deemix-server-linux-arm64\"}"
+        --assets-link "{\"name\":\"deemix-server-linux-arm64\",\"url\":\"${PACKAGE_REGISTRY_URL}/deemix-server-linux-arm64\"}" \
+        --assets-link "{\"name\":\"deemix-server-linux-armv7\",\"url\":\"${PACKAGE_REGISTRY_URL}/deemix-server-linux-arm\"}" \
   only:
     refs:
-      - CI-test
+      - master
 
 build-docker-image:
   image: docker:19
@@ -109,9 +75,9 @@ build-docker-image:
     - docker run --rm --privileged docker/binfmt:${BINFMT_IMAGE_TAG}
     # create the multibuilder
     - docker buildx create --name multibuilder
-    - docker buildx use multibuilder    
+    - docker buildx use multibuilder
     # build and push
-    - docker buildx build --platform "${PLATFORMS_DOCKER}" -t ${CI_REGISTRY_IMAGE}:${IMAGE_TAG_TEST} . --push
+    - docker buildx build --platform "${PLATFORMS}" -t ${CI_REGISTRY_IMAGE}:${IMAGE_TAG_TEST} . --push
     # Also can do using date, so we dont dependant on latest, in case application break again.
     #- docker buildx build --platform "${PLATFORMS}" -t ${CI_REGISTRY_IMAGE}:${DATE} -t $CI_REGISTRY_IMAGE:${IMAGE_TAG} . --push
   only:
diff --git a/server.package.json b/server.package.json
index 76fd74e..84272e6 100644
--- a/server.package.json
+++ b/server.package.json
@@ -22,9 +22,9 @@
 			"../package.json"
 		],
 		"targets": [
-			"node16.4.1-linuxstatic-x64",
-			"node16.4.1-linuxstatic-arm64",
-			"node16.4.1-linuxstatic-armv7"
+			"node16-linuxstatic-x64",
+			"node16-linuxstatic-arm64",
+			"node16-linuxstatic-armv7"
 		]
 	},
 	"dependencies": {