@@ -139,8 +139,6 @@ jobs:
139139 run : |
140140 cd ${{ env.NNCC_BUILD }}/${{ env.CIRINTP_PREFIX }}
141141 cp -rf ../../infra/debian/circle-interpreter ./debian
142- mv ./debian/changelog-${{ matrix.ubuntu_code }} ./debian/changelog
143- rm -f ./debian/changelog-*
144142 export DEBFULLNAME="${{ inputs.deb_fullname }}"
145143 export DEBEMAIL="${{ inputs.deb_email }}"
146144 dch -v "${{ steps.prepare.outputs.VERSION }}" \
@@ -187,28 +185,22 @@ jobs:
187185 # TODO change to the 'ubuntu-latest'
188186 # runs-on: ubuntu-latest
189187 runs-on : [ self-hosted, shs-park ]
188+ env :
189+ DEFAULT_DISTRO : jammy
190190
191191 steps :
192- - name : Download tarball, focal
193- uses : actions/download-artifact@v4
194- with :
195- name : circle-interpreter_${{ needs.configure.outputs.version }}~focal
196-
197- - name : Download tarball, jammy
192+ - name : Download tarball, ${{ env.DEFAULT_DISTRO }}
198193 uses : actions/download-artifact@v4
199194 with :
200- name : circle-interpreter_${{ needs.configure.outputs.version }}~jammy
195+ name : circle-interpreter_${{ needs.configure.outputs.version }}~${{ env.DEFAULT_DISTRO }}
201196
202197 - name : Copy changelogs
203198 run : |
204- mkdir -p changelogs
205- for distro in focal jammy; do
206- mkdir ${distro}
207- tar -axf circle-interpreter_${{ needs.configure.outputs.version }}~${distro}.orig.tar.xz \
208- -C ${distro}
209- cp ${distro}/cirintp/debian/changelog changelogs/changelog-${distro}
210- done
211- ls -alh ./changelogs/ # TODO remove this
199+ mkdir changelogs
200+ mkdir ${{ env.DEFAULT_DISTRO }}
201+ tar -axf circle-interpreter_${{ needs.configure.outputs.version }}~${{ env.DEFAULT_DISTRO }}.orig.tar.xz \
202+ -C ${{ env.DEFAULT_DISTRO }}
203+ cp ${{ env.DEFAULT_DISTRO }}/cirintp/debian/changelog changelogs/changelog
212204
213205 - name : Upload artifact, changelogs
214206 uses : actions/upload-artifact@v4
@@ -252,19 +244,17 @@ jobs:
252244 with :
253245 name : changelogs
254246
255- - name : Extract changelog
247+ - name : Update the changelog file
256248 run : |
257- ls -alh # TODO remove this
258- cp changelog-* \
259- infra/debian/circle-interpreter/
249+ cp changelog infra/debian/circle-interpreter/
260250
261251 - name : Create PR branch and commit changelog
262252 env :
263253 GH_TOKEN : ${{ secrets.GITHUB_TOKEN }}
264254 run : |
265255 BRANCH=auto/update-cirint-changelog-${BR_VERSION}
266256 git checkout -b ${BRANCH}
267- git add infra/debian/circle-interpreter/changelog-*
257+ git add infra/debian/circle-interpreter/changelog
268258 git commit -m "[infra/debian] Update changelog for circle-interpreter" \
269259 -m "This updates the changelog for circle-interpreter_${{ steps.prepare.outputs.VERSION }}." \
270260 -m "It is auto-generated PR from github workflow." \
0 commit comments