upd job_sync && upd gitignore && upd gomod

2025-12-29 12:36:39 +03:00
parent 13cde2b7b4
commit 2803a5a8b3
4 changed files with 107 additions and 42 deletions
--- a/.github/workflows/job_sync.yml
+++ b/.github/workflows/job_sync.yml
@@ -11,42 +11,84 @@ jobs:
    if: github.server_url != 'https://github.com'
    runs-on: ubuntu-latest
    steps:
-    - name: init
-      run: |
-        git config --global user.email "vtolstov <vtolstov@users.noreply.github.com>"
-        git config --global user.name "github-actions[bot]"
-        echo "machine git.unistack.org login vtolstov password ${{ secrets.TOKEN_GITEA }}" >> /root/.netrc
-        echo "machine github.com login vtolstov password ${{ secrets.TOKEN_GITHUB }}" >> /root/.netrc
+      - name: init
+        run: |
+          git config --global user.email "vtolstov <vtolstov@users.noreply.github.com>"
+          git config --global user.name "github-actions[bot]"
+          echo "machine git.unistack.org login vtolstov password ${{ secrets.TOKEN_GITEA }}" >> /root/.netrc
+          echo "machine github.com login vtolstov password ${{ secrets.TOKEN_GITHUB }}" >> /root/.netrc

-    - name: sync master
-      run: |
-        git clone --filter=blob:none --filter=tree:0 --branch master --single-branch ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} repo
-        cd repo
-        git remote add --no-tags --fetch --track master upstream https://github.com/${GITHUB_REPOSITORY}
-        git pull --rebase upstream master
-        git push upstream master --progress
-        git push origin master --progress
-        cd ../
-        rm -rf repo
+      - name: check master
+        id: check_master
+        run: |
+          src_hash=$(git ls-remote https://github.com/${GITHUB_REPOSITORY} refs/heads/master | cut -f1)
+          dst_hash=$(git ls-remote ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} refs/heads/master | cut -f1)
+          echo "src_hash=$src_hash"
+          echo "dst_hash=$dst_hash"
+          if [ "$src_hash" != "$dst_hash" -a "$src_hash" != "" -a "$dst_hash" != "" ]; then
+            echo "sync_needed=true" >> $GITHUB_OUTPUT
+          else
+            echo "sync_needed=false" >> $GITHUB_OUTPUT
+          fi

-    - name: sync v3
-      run: |
-        git clone --filter=blob:none --filter=tree:0 --branch v3 --single-branch ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} repo
-        cd repo
-        git remote add --no-tags --fetch --track v3 upstream https://github.com/${GITHUB_REPOSITORY}
-        git pull --rebase upstream v3
-        git push upstream v3 --progress
-        git push origin v3 --progress
-        cd ../
-        rm -rf repo
+      - name: sync master
+        if: steps.check_master.outputs.sync_needed == 'true'
+        run: |
+          git clone --filter=blob:none --filter=tree:0 --branch master --single-branch ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} repo
+          cd repo
+          git remote add --no-tags --fetch --track master upstream https://github.com/${GITHUB_REPOSITORY}
+          git pull --rebase upstream master
+          git push upstream master --progress
+          git push origin master --progress
+          cd ../
+          rm -rf repo

-    - name: sync v4
-      run: |
-        git clone --filter=blob:none --filter=tree:0 --branch v4 --single-branch ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} repo
-        cd repo
-        git remote add --no-tags --fetch --track v4 upstream https://github.com/${GITHUB_REPOSITORY}
-        git pull --rebase upstream v4
-        git push upstream v4 --progress
-        git push origin v4 --progress
-        cd ../
-        rm -rf repo
+      - name: check v3
+        id: check_v3
+        run: |
+          src_hash=$(git ls-remote https://github.com/${GITHUB_REPOSITORY} refs/heads/v3 | cut -f1)
+          dst_hash=$(git ls-remote ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} refs/heads/v3 | cut -f1)
+          echo "src_hash=$src_hash"
+          echo "dst_hash=$dst_hash"
+          if [ "$src_hash" != "$dst_hash" ]; then
+            echo "sync_needed=true" >> $GITHUB_OUTPUT
+          else
+            echo "sync_needed=false" >> $GITHUB_OUTPUT
+          fi
+
+      - name: sync v3
+        if: steps.check_v3.outputs.sync_needed == 'true'
+        run: |
+          git clone --filter=blob:none --filter=tree:0 --branch v3 --single-branch ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} repo
+          cd repo
+          git remote add --no-tags --fetch --track v3 upstream https://github.com/${GITHUB_REPOSITORY}
+          git pull --rebase upstream v3
+          git push upstream v3 --progress
+          git push origin v3 --progress
+          cd ../
+          rm -rf repo
+
+      - name: check v4
+        id: check_v4
+        run: |
+          src_hash=$(git ls-remote https://github.com/${GITHUB_REPOSITORY} refs/heads/v4 | cut -f1)
+          dst_hash=$(git ls-remote ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} refs/heads/v4 | cut -f1)
+          echo "src_hash=$src_hash"
+          echo "dst_hash=$dst_hash"
+          if [ "$src_hash" != "$dst_hash" ]; then
+            echo "sync_needed=true" >> $GITHUB_OUTPUT
+          else
+            echo "sync_needed=false" >> $GITHUB_OUTPUT
+          fi
+
+      - name: sync v4
+        if: steps.check_v4.outputs.sync_needed == 'true'
+        run: |
+          git clone --filter=blob:none --filter=tree:0 --branch v4 --single-branch ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} repo
+          cd repo
+          git remote add --no-tags --fetch --track v4 upstream https://github.com/${GITHUB_REPOSITORY}
+          git pull --rebase upstream v4
+          git push upstream v4 --progress
+          git push origin v4 --progress
+          cd ../
+          rm -rf repo
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,9 @@
+# Develop tools
+/.vscode/
+/.idea/
+.idea
+.vscode
+
 # Binaries for programs and plugins
 *.exe
 *.exe~
@@ -5,11 +11,29 @@
 *.so
 *.dylib

-# Test binary, built with `go test -c`
+# Folders
+_obj
+_test
+_build
+.DS_Store
+
+# Architecture specific extensions/prefixes
+*.[568vq]
+[568vq].out
+
+*.cgo1.go
+*.cgo2.c
+_cgo_defun.c
+_cgo_gotypes.go
+_cgo_export.*
+
+# Test binary, build with `go test -c`
 *.test

 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out

-# Dependency directories (remove the comment below to include it)
-# vendor/
+# vim temp files
+*~
+*.swp
+*.swo
--- a/go.mod
+++ b/go.mod
@@ -2,7 +2,6 @@ module go.unistack.org/micro-codec-urlencode/v4

 go 1.22.0

-
 require (
 	go.unistack.org/micro-proto/v4 v4.1.0
 	go.unistack.org/micro/v4 v4.1.3
--- a/go.sum
+++ b/go.sum
@@ -21,8 +21,8 @@ go.unistack.org/micro-proto/v4 v4.1.0 h1:qPwL2n/oqh9RE3RTTDgt28XK3QzV597VugQPaw9
 go.unistack.org/micro-proto/v4 v4.1.0/go.mod h1:ArmK7o+uFvxSY3dbJhKBBX4Pm1rhWdLEFf3LxBrMtec=
 go.unistack.org/micro/v4 v4.1.3 h1:9QHiLHBTfPtfKyoY3HsLPNVSK0wlAAoMV+9saLz2iR4=
 go.unistack.org/micro/v4 v4.1.3/go.mod h1:lr3oYED8Ay1vjK68QqRw30QOtdk/ffpZqMFDasOUhKw=
-google.golang.org/protobuf v1.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU=
-google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
+google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=