diff --git a/.github/workflows/test-all.yaml b/.github/workflows/test-all.yaml index 488b7054..a09ba17a 100644 --- a/.github/workflows/test-all.yaml +++ b/.github/workflows/test-all.yaml @@ -15,7 +15,7 @@ jobs: run: echo "::set-output name=branch::${GITHUB_REF#refs/heads/}" id: myref - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - id: set-matrix # This is very hacky, but it goes like that: # 1) Associate base_ref with origin/base_ref since actions/checkout doesn't do it, if we don't do that we won't be able to check the actual diff @@ -63,7 +63,7 @@ jobs: steps: # Source - name: Checkout current repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: functions # Install python 3.9 @@ -106,11 +106,11 @@ jobs: run: echo "::set-output name=branch::${GITHUB_REF#refs/heads/}" id: branch - name: Checkout current repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: functions - name: Checkout Marketplace - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: mlrun/marketplace path: marketplace @@ -134,7 +134,7 @@ jobs: python functions/functions.py build-marketplace -s functions -m marketplace -c $CHANNEL -v -f - name: Publish marketplace release env: - GITHUB_TOKEN: ${{ secrets.MARKETPLACE_ACCESS_TOKEN_V4 }} + GITHUB_TOKEN: ${{ secrets.MARKETPLACE_ACCESS_TOKEN_V3 }} USERNAME: iguazio-cicd USEREMAIL: iguaziocicd@gmail.com REPO_PATH: marketplace @@ -154,26 +154,30 @@ jobs: exit 1; }; git config --local user.name $USERNAME - git config --global user.email $USEREMAIL - git config --global user.name $USERNAME + git config --local user.email $USEREMAIL git branch --set-upstream-to origin/master git remote -v - echo "Checking out [$BRANCH_NAME]..." + echo "1. Checking out [$BRANCH_NAME]..." git checkout -b $BRANCH_NAME - echo "Checking out [$BASE_BRANCH]..." + echo "2. Checking out [$BASE_BRANCH]..." git checkout $BASE_BRANCH git pull - echo "Checking out [$BRANCH_NAME]..." + echo "3. Checking out [$BRANCH_NAME]..." git checkout $BRANCH_NAME + echo "3a. merging" git merge $BASE_BRANCH + echo "3b. status" git status git status --ignored find . -type f | xargs ls -artl + echo "3b. add" git add --all git status git status --ignored - echo "Commiting changes..." + echo "4. Commiting changes..." + echo "4a. git rev-parse" git rev-parse --show-toplevel + echo "4b. git commit" git commit -a -m "Automatically generated by github-worflow[bot] for commit: $COMMIT_SHA" git status git status --ignored