@@ -78,11 +78,15 @@ jobs:
7878 ref : dev
7979 fetch-depth : 0
8080
81- - name : Merge main into dev
81+ - name : Set Git Identity
8282 run : |
8383 git config --global user.name '${{env.BUILD_BOT}}'
84- git config --global user.email '${{ env.BUILD_BOT }}@users.noreply.github.com'
85- git merge origin/main
84+ git config --global user.email '${{env.BUILD_BOT}}@users.noreply.github.com'
85+ env :
86+ GITHUB_TOKEN : ${{ secrets.POLYWRAP_BUILD_BOT_PAT }}
87+
88+ - name : Merge main into dev
89+ run : git merge origin/main
8690
8791 - name : set env.RELEASE_FORKS to Release Forks' Organization
8892 run : echo RELEASE_FORKS=polywrap-release-forks >> $GITHUB_ENV
@@ -93,35 +97,28 @@ jobs:
9397 - name : Read VERSION into env.RELEASE_VERSION
9498 run : echo RELEASE_VERSION=$(cat VERSION) >> $GITHUB_ENV
9599
96- - name : Set up Python 3.10
97- uses : actions/setup-python@v4
98- with :
99- python-version : " 3.10"
100+ # - name: Set up Python 3.10
101+ # uses: actions/setup-python@v4
102+ # with:
103+ # python-version: "3.10"
100104
101- - name : Install poetry
102- run : curl -sSL https://install.python-poetry.org | python3 -
105+ # - name: Install poetry
106+ # run: curl -sSL https://install.python-poetry.org | python3 -
103107
104- - name : Install tomlkit
105- run : pip3 install tomlkit
106-
107- - name : Set Git Identity
108- run : |
109- git config --global user.name '${{env.BUILD_BOT}}'
110- git config --global user.email '${{env.BUILD_BOT}}@users.noreply.github.com'
111- env :
112- GITHUB_TOKEN : ${{ secrets.POLYWRAP_BUILD_BOT_PAT }}
108+ # - name: Install tomlkit
109+ # run: pip3 install tomlkit
113110
114- - name : Link Packages in dev branch
115- run : python3 scripts/link_packages.py
111+ # - name: Link Packages in dev branch
112+ # run: python3 scripts/link_packages.py
116113
117114 - name : Create Pull Request
118115 id : cpr
119116 uses : peter-evans/create-pull-request@v3
120117 with :
121118 token : ${{ secrets.POLYWRAP_BUILD_BOT_PAT }}
122119 push-to-fork : ${{env.RELEASE_FORKS}}/${{github.event.pull_request.base.repo.name}}
123- branch : post-release/origin-${{env.RELEASE_VERSION}}
124- base : origin/dev
120+ # branch: post-release/origin-${{env.RELEASE_VERSION}}
121+ # base: origin/dev
125122 committer : GitHub <noreply@github.com>
126123 author : ${{env.BUILD_BOT}} <${{env.BUILD_BOT}}@users.noreply.github.com>
127124 commit-message : " DEV ${{env.RELEASE_VERSION}}"
0 commit comments