diff --git a/.github/workflows/merge-variants.yml b/.github/workflows/merge-variants.yml index 2597dc87..5f539825 100644 --- a/.github/workflows/merge-variants.yml +++ b/.github/workflows/merge-variants.yml @@ -17,4 +17,4 @@ jobs: run: | git config --add user.name "${GITHUB_ACTOR:-Github Actions}" git config --add user.email "actions@github.com" - ./docker-versions-create.sh -b -w + ./docker-versions-create.sh -b diff --git a/docker-versions-create.sh b/docker-versions-create.sh index 017b2c9f..6f8b7d0c 100755 --- a/docker-versions-create.sh +++ b/docker-versions-create.sh @@ -18,9 +18,8 @@ function TrapExit { } batchMode=false -skipWorkflowChanges=false -while getopts "hbt:sw" arg +while getopts "hbt:s" arg do case $arg in b) @@ -32,9 +31,6 @@ do s) tagArgs="-s -m 'Signed during docker-versions-create" ;; - w) - skipWorkflowChanges=true - ;; h) echo " Usage $0 [options] @@ -45,7 +41,6 @@ Options: -t TAG tag and push the current revision on master with the given tag and apply respective tags to each branch -s enable signed tags - -w skip any changes to .github/workflows -h display this help and exit " exit @@ -91,7 +86,6 @@ for branch in "${branches_list[@]}"; do if git merge -m 'Auto-merging via docker-versions-create' master; then proceed="True" echo "Branch $branch updated to current master successfully" - ${skipWorkflowChanges} && git restore .github/workflows # pushing changes to remote for this branch git commit -m "Auto merge branch with master" -a # push may fail if remote doesn't have this branch yet. In this case - sending branch