зеркало из https://github.com/microsoft/git.git
Bump a couple of GitHub Actions versions (#685)
I propose this alternative to https://github.com/microsoft/git/pull/684, for several reasons: - according to https://github.blog/changelog/2023-12-14-github-actions-artifacts-v4-is-now-generally-available/, it is incorrect to bump `download-artifact` to v4 _without_ also bumping `upload-artifact` to the same version. - bumping it to v4.1.7 instead of v4 would require us to follow the versions in too fine-grained a way, better to just follow v4. - there is also a v4 of `actions/checkout` that we need to use - to accommodate `microsoft/git`'s release flow, the changes need to be split into appropriate `fixup!` commits so that the next time we rebase to a newer upstream version, the changes are folded into the appropriate patches.
This commit is contained in:
Коммит
f6cad7c4c4
|
@ -143,7 +143,7 @@ jobs:
|
||||||
git commit -s -m "mingw-w64-git: new version ($version)" PKGBUILD &&
|
git commit -s -m "mingw-w64-git: new version ($version)" PKGBUILD &&
|
||||||
git bundle create "$b"/MINGW-packages.bundle origin/main..main)
|
git bundle create "$b"/MINGW-packages.bundle origin/main..main)
|
||||||
- name: Publish mingw-w64-x86_64-git
|
- name: Publish mingw-w64-x86_64-git
|
||||||
uses: actions/upload-artifact@v3
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: pkg-x86_64
|
name: pkg-x86_64
|
||||||
path: artifacts
|
path: artifacts
|
||||||
|
@ -163,7 +163,7 @@ jobs:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
steps:
|
steps:
|
||||||
- name: Download pkg-x86_64
|
- name: Download pkg-x86_64
|
||||||
uses: actions/download-artifact@v3
|
uses: actions/download-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: pkg-x86_64
|
name: pkg-x86_64
|
||||||
path: pkg-x86_64
|
path: pkg-x86_64
|
||||||
|
@ -298,7 +298,7 @@ jobs:
|
||||||
PATH=$PATH:"/c/Program Files (x86)/Windows Kits/10/App Certification Kit/" \
|
PATH=$PATH:"/c/Program Files (x86)/Windows Kits/10/App Certification Kit/" \
|
||||||
signtool verify //pa artifacts/${{matrix.artifact.fileprefix}}-*.exe
|
signtool verify //pa artifacts/${{matrix.artifact.fileprefix}}-*.exe
|
||||||
- name: Publish ${{matrix.artifact.name}}-x86_64
|
- name: Publish ${{matrix.artifact.name}}-x86_64
|
||||||
uses: actions/upload-artifact@v3
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: win-${{matrix.artifact.name}}-x86_64
|
name: win-${{matrix.artifact.name}}-x86_64
|
||||||
path: artifacts
|
path: artifacts
|
||||||
|
@ -318,7 +318,7 @@ jobs:
|
||||||
environment: release
|
environment: release
|
||||||
steps:
|
steps:
|
||||||
- name: Check out repository
|
- name: Check out repository
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
path: 'git'
|
path: 'git'
|
||||||
|
|
||||||
|
@ -465,7 +465,7 @@ jobs:
|
||||||
mv git/.github/macos-installer/disk-image/*.pkg git/.github/macos-installer/
|
mv git/.github/macos-installer/disk-image/*.pkg git/.github/macos-installer/
|
||||||
|
|
||||||
- name: Upload artifacts
|
- name: Upload artifacts
|
||||||
uses: actions/upload-artifact@v3
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: macos-artifacts
|
name: macos-artifacts
|
||||||
path: |
|
path: |
|
||||||
|
@ -486,7 +486,7 @@ jobs:
|
||||||
sudo apt-get install -y -q --no-install-recommends gettext libcurl4-gnutls-dev libpcre3-dev asciidoc xmlto
|
sudo apt-get install -y -q --no-install-recommends gettext libcurl4-gnutls-dev libpcre3-dev asciidoc xmlto
|
||||||
|
|
||||||
- name: Clone git
|
- name: Clone git
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
path: git
|
path: git
|
||||||
|
|
||||||
|
@ -588,7 +588,7 @@ jobs:
|
||||||
debsigs --sign=origin --verify --check microsoft-git_"$version".deb
|
debsigs --sign=origin --verify --check microsoft-git_"$version".deb
|
||||||
|
|
||||||
- name: Upload artifacts
|
- name: Upload artifacts
|
||||||
uses: actions/upload-artifact@v3
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: linux-artifacts
|
name: linux-artifacts
|
||||||
path: |
|
path: |
|
||||||
|
@ -617,7 +617,7 @@ jobs:
|
||||||
needs: [prereqs, windows_artifacts, create-macos-artifacts, create-linux-artifacts]
|
needs: [prereqs, windows_artifacts, create-macos-artifacts, create-linux-artifacts]
|
||||||
steps:
|
steps:
|
||||||
- name: Download artifacts
|
- name: Download artifacts
|
||||||
uses: actions/download-artifact@v3
|
uses: actions/download-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: ${{ matrix.component.artifact }}
|
name: ${{ matrix.component.artifact }}
|
||||||
|
|
||||||
|
@ -684,25 +684,25 @@ jobs:
|
||||||
needs.windows_artifacts.result == 'success')
|
needs.windows_artifacts.result == 'success')
|
||||||
steps:
|
steps:
|
||||||
- name: Download Windows portable installer
|
- name: Download Windows portable installer
|
||||||
uses: actions/download-artifact@v3
|
uses: actions/download-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: win-portable-x86_64
|
name: win-portable-x86_64
|
||||||
path: win-portable-x86_64
|
path: win-portable-x86_64
|
||||||
|
|
||||||
- name: Download Windows x86_64 installer
|
- name: Download Windows x86_64 installer
|
||||||
uses: actions/download-artifact@v3
|
uses: actions/download-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: win-installer-x86_64
|
name: win-installer-x86_64
|
||||||
path: win-installer-x86_64
|
path: win-installer-x86_64
|
||||||
|
|
||||||
- name: Download macOS artifacts
|
- name: Download macOS artifacts
|
||||||
uses: actions/download-artifact@v3
|
uses: actions/download-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: macos-artifacts
|
name: macos-artifacts
|
||||||
path: macos-artifacts
|
path: macos-artifacts
|
||||||
|
|
||||||
- name: Download Debian package
|
- name: Download Debian package
|
||||||
uses: actions/download-artifact@v3
|
uses: actions/download-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: linux-artifacts
|
name: linux-artifacts
|
||||||
path: deb-package
|
path: deb-package
|
||||||
|
|
Загрузка…
Ссылка в новой задаче