Build CRX for chrome. #force-rebuild:chrome

.gitlab-ci.yml

@@ -128,21 +128,14 @@ build:edge:release:
 # Build for Chrome
 #
 
-.build:chrome:
+build:chrome:beta:
   stage: build
   image: python:3.7-stretch
-  artifacts:
-    paths:
-      - safelinks-cleaner-chrome-$VARIANT.zip
-
-build:chrome:beta:
   extends: .build:chrome
-  variables:
-    VARIANT: beta
   script:
     - apt-get -y update
     - apt-get -y install zip xxd
-    - bash scripts/crxbuild.sh -o safelinks-cleaner-chrome-$VARIANT.crx -k "$CHROME_SIGNING_KEY" -s build/chrome
+    - bash scripts/crxbuild.sh -o "safelinks-cleaner-chrome-beta.crx" -k "$CHROME_SIGNING_KEY" -s build/chrome
   rules:
     - if: '$CI_COMMIT_BRANCH != "master"'
       when: never
@@ -157,16 +150,20 @@ build:chrome:beta:
         - edge/**/*
       when: always
     - when: never
+  artifacts:
+    paths:
+      - safelinks-cleaner-chrome-beta.crx
 
 build:chrome:release:
   extends: .build:chrome
-  variables:
-    VARIANT: release
   script:
     - apt-get -y update
     - apt-get -y install zip
     - cd build/chrome
-    - zip -r ../../safelinks-cleaner-chrome-$VARIANT.zip *
+    - zip -r ../../safelinks-cleaner-chrome-release.zip *
+  artifacts:
+    paths:
+      - safelinks-cleaner-chrome-release.zip
   <<: *release_rules
     
 

scripts/crxbuild.sh

@@ -19,8 +19,7 @@ fatal() {
 }
 
 cleanup() {
-    echo "$TMPDIR"
-#    rm -rf "$TMPDIR"
+    rm -rf "$TMPDIR"
 }
 
 swap_bytes () {
@@ -80,9 +79,6 @@ truncate -s 16 "$TMPDIR/extension.id"
 
 openssl rsa -pubout -outform DER < "$KEY_FILE" > "$TMPDIR/extension.pub" 2>/dev/null
 
-
-
-
 crmagic_hex="43 72 32 34" # Cr24
 version_hex="03 00 00 00" # 3
 header_length="45 02 00 00"
@@ -98,17 +94,4 @@ header_chunk_3="82 F1 04 12 0A 10"
   cat "$TMPDIR/extension.id" "$TMPDIR/extension.zip"
 ) > "$OUTPUT_FILE"
 
-
-# 
-# 
-# crmagic_hex="4372 3234" # Cr24
-# version_hex="0200 0000" # 2
-# pub_len_hex=$(swap_bytes $(printf '%08x\n' $(ls -l "$TMPDIR/extension.pub" | awk '{print $5}')))
-# sig_len_hex=$(swap_bytes $(printf '%08x\n' $(ls -l "$TMPDIR/extension.sig" | awk '{print $5}')))
-# 
-# (
-#   echo "$crmagic_hex $version_hex $pub_len_hex $sig_len_hex" | xxd -r -p
-#   cat "$TMPDIR/extension.pub" "$TMPDIR/extension.sig" "$TMPDIR/extension.zip"
-# ) > "$OUTPUT_FILE"
-# 
-# 
+echo "CRX file built: $OUTPUT_FILE"