fix pup command

This reverts commit 58fe440996.

.github/workflows/build_bromite_dev.yaml

@@ -250,9 +250,9 @@ jobs:
 
              echo "::group::-------- gn gen"
              [[ "$USEGOMA" = "true" ]] && \
-                gn gen --args="import(\"/home/lg/working_dir/bromite/build/GN_ARGS\") use_goma=true goma_dir=\"$WORKSPACE/goma\" $(cat ../../build_args.gni) " out/bromite \
+                gn gen --args="import(\"/home/lg/working_dir/bromite/build/bromite.gn_args\") use_goma=true goma_dir=\"$WORKSPACE/goma\" $(cat ../../build_args.gni) " out/bromite \
                 || \
-                gn gen --args="import(\"/home/lg/working_dir/bromite/build/GN_ARGS\") $(cat ../../build_args.gni) " out/bromite              
+                gn gen --args="import(\"/home/lg/working_dir/bromite/build/bromite.gn_args\") $(cat ../../build_args.gni) " out/bromite              
              echo "::endgroup::"
 
              echo "::group::-------- gn args"

.github/workflows/release.yaml

@@ -45,7 +45,7 @@ jobs:
         run: |
           wget https://github.com/ericchiang/pup/releases/download/v0.4.0/pup_v0.4.0_linux_amd64.zip
           unzip pup_v0.4.0_linux_amd64.zip && rm pup_v0.4.0_linux_amd64.zip
-          BRANCH=$(curl https://github.com/uazo/bromite/branch_commits/$BROMITE_SHA | ./pup -p li.branch a text{})
+          BRANCH=$(curl https://github.com/uazo/bromite/branch_commits/$BROMITE_SHA | ./pup -p li.branch:last-child a text{})
           echo "BRANCH=$BRANCH" >> $GITHUB_ENV
 
           wget https://github.com/cli/cli/releases/download/v2.4.0/gh_2.4.0_linux_amd64.tar.gz

create-from-patch.sh

@@ -10,7 +10,7 @@ fi
 
 if [ -z "$2" ]
 then
-        PATCH_NEW_PATH="~/bromite/build/patches-new"
+        PATCH_NEW_PATH=~/bromite/build/patches-new
 else
         PATCH_NEW_PATH=$2
 fi

export-patch-list.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+VERSION=$(cat ~/bromite/build/RELEASE)
+CURRENT_RELEASE=$(git -C ~/chromium/src/ rev-parse --verify refs/tags/$VERSION)
+
+ALLPATCHS_E=$(git -C ~/chromium/src/ rev-list HEAD...$CURRENT_RELEASE)
+
+mkdir ~/bromite/build/patches-new
+rm ~/bromite/build/patches-new/patch-list
+
+NO_NAME=1
+
+for patch in $ALLPATCHS_E; do
+
+	PATCH_FILE=$(git -C ~/chromium/src/ show -s $patch | grep FILE: | sed 's/FILE://g' | sed 's/^[ \t]*//;s/[ \t]*$//')
+	if [[ "$PATCH_FILE" == *"Automated-domain-substitution"* ]]; then
+		continue
+	fi
+
+	echo $PATCH_FILE >>~/bromite/build/patches-new/patch-list
+
+done
+
+tac ~/bromite/build/patches-new/patch-list >~/bromite/build/patches-new/zz-patch-list.txt
+rm ~/bromite/build/patches-new/patch-list

export-single-patch.sh

@@ -32,9 +32,9 @@ sed -i '/^ mode change/d' ~/bromite/build/patches-new/$PATCH_FILE
 sed -i '/^old mode /d' ~/bromite/build/patches-new/$PATCH_FILE
 sed -i '/^new mode /d' ~/bromite/build/patches-new/$PATCH_FILE
 
-echo "-- " >> ~/bromite/build/patches-new/$PATCH_FILE
+echo "--" >> ~/bromite/build/patches-new/$PATCH_FILE
-echo "2.20.1" >> ~/bromite/build/patches-new/$PATCH_FILE
+echo "2.25.1" >> ~/bromite/build/patches-new/$PATCH_FILE
-echo "" >> ~/bromite/build/patches-new/$PATCH_FILE
+#echo "" >> ~/bromite/build/patches-new/$PATCH_FILE
 
 echo "   done."
 echo ""

images/bromite-build/build_args.gni

@@ -15,6 +15,7 @@ if(getenv("TARGET_CPU") != "") {
 
 enable_kythe_annotations = true
 clang_use_chrome_plugins = false
+chrome_public_manifest_package = "org.bromite.bromite.dev"
 
 if(_is_debug_build == "true") {
 # print("Debug build on")
@@ -24,6 +25,11 @@ if(_is_debug_build == "true") {
   symbol_level = 1
   strip_debug_info = false
   generate_linker_map = false
+
+  # since is_cfi require use_thin_lto
+  # but not work in debug mode
+  is_cfi = false # disable it
+  use_cfi_cast = false # disable it
 } else {
   generate_linker_map = true
 }

images/github-runner/Dockerfile

@@ -77,7 +77,7 @@ RUN useradd -m runner \
 
 # Build args
 ARG TARGETPLATFORM=amd64
-ARG RUNNER_VERSION=2.302.4
+ARG RUNNER_VERSION=2.302.5
 WORKDIR /runner
 
 # Runner download supports amd64 as x64

images/github-runner/startup.sh

@@ -48,7 +48,9 @@ echo "Registering runner ${runner_id}"
   --url "${registration_url}" \
   --allowedauthorslist "${ALLOWEDAUTHORSLIST}" \
   --unattended \
-  --replace
+  --replace \
+  --disableupdate \
+  --ephemeral
 
 trap 'remove_runner; exit 130' SIGINT
 trap 'remove_runner; exit 143' SIGTERM