Skip to content

Commit

Permalink
Update GH Actions (flameshot-org#3361)
Browse files Browse the repository at this point in the history
* update actions to use checkout version 4

* update upload-artifact action

(cherry picked from commit 89718c8)
  • Loading branch information
Klaus Rettinghaus authored and Yuriy Puchkov committed Dec 22, 2023
1 parent 57a9aae commit 55dbc3a
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 38 deletions.
42 changes: 21 additions & 21 deletions .github/workflows/Linux-pack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ env:
jobs:
deb-pack:
name: Build deb on ${{ matrix.dist.name }} ${{ matrix.dist.arch }}
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -121,13 +121,13 @@ jobs:
fi
- name: Checkout Source code
if: github.event_name == 'push'
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: master
- name: Checkout Source code
if: github.event_name == 'pull_request'
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ github.event.pull_request.head.sha }}
Expand All @@ -143,7 +143,7 @@ jobs:
echo "================================"
echo "VERSION=${last_committed_tag:1}" >> $GITHUB_ENV
- name: Get packpack tool
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
repository: ${{ env.PACKPACK_REPO }}
path: tools
Expand Down Expand Up @@ -205,7 +205,7 @@ jobs:
echo $(sh $GITHUB_WORKSPACE/scripts/upload_services/${UPLOAD_SERVICE}.sh $GITHUB_WORKSPACE/build/${PRODUCT}-${VERSION}-${RELEASE}.${{ matrix.dist.name }}.${{ matrix.dist.arch }}.deb)
echo "======no operation for you can see link in the log console====="
- name: Artifact Upload
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: Linux-distribution-artifact
path: |
Expand All @@ -214,7 +214,7 @@ jobs:
rpm-pack:
name: Build rpm on ${{ matrix.dist.name }} ${{ matrix.dist.arch }}
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
Expand All @@ -240,13 +240,13 @@ jobs:
steps:
- name: Checkout Source code
if: github.event_name == 'push'
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: master
- name: Checkout Source code
if: github.event_name == 'pull_request'
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ github.event.pull_request.head.sha }}
Expand All @@ -262,7 +262,7 @@ jobs:
echo "================================"
echo "VERSION=${last_committed_tag:1}" >> $GITHUB_ENV
- name: Get packpack tool
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
repository: ${{ env.PACKPACK_REPO }}
path: tools
Expand Down Expand Up @@ -312,15 +312,15 @@ jobs:
echo "======no operation for you can see link in the log console====="
- name: Artifact Upload
if: matrix.dist.os == 'fedora'
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: Linux-distribution-artifact
path: |
${{ github.workspace }}/build/
- name: Artifact Upload
if: matrix.dist.os == 'opensuse-leap'
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: Linux-distribution-artifact
path: |
Expand All @@ -329,7 +329,7 @@ jobs:
appimage-pack:
name: Build appimage on ${{ matrix.config.name }}
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
Expand All @@ -352,13 +352,13 @@ jobs:
- name: Checkout Source code
if: github.event_name == 'push'
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: master
- name: Checkout Source code
if: github.event_name == 'pull_request'
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ github.event.pull_request.head.sha }}
Expand Down Expand Up @@ -453,7 +453,7 @@ jobs:
echo $(sh $GITHUB_WORKSPACE/scripts/upload_services/${UPLOAD_SERVICE}.sh $GITHUB_WORKSPACE/Flameshot-${VERSION}.x86_64.AppImage)
echo "======no operation for you can see link in the log console====="
- name: Artifact Upload
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: Linux-distribution-artifact
path: |
Expand All @@ -466,13 +466,13 @@ jobs:
steps:
- name: Checkout Source code
if: github.event_name == 'push'
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: master
- name: Checkout Source code
if: github.event_name == 'pull_request'
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ github.event.pull_request.head.sha }}
Expand Down Expand Up @@ -519,7 +519,7 @@ jobs:
echo $(sh $GITHUB_WORKSPACE/scripts/upload_services/${UPLOAD_SERVICE}.sh $GITHUB_WORKSPACE/org.flameshot.Flameshot-${VERSION}.x86_64.flatpak)
echo "======no operation for you can see link in the log console====="
- name: Artifact Upload
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: Linux-distribution-artifact
path: |
Expand All @@ -532,13 +532,13 @@ jobs:
steps:
- name: Checkout Source code
if: github.event_name == 'push'
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: master
- name: Checkout Source code
if: github.event_name == 'pull_request'
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ github.event.pull_request.head.sha }}
Expand Down Expand Up @@ -576,7 +576,7 @@ jobs:
echo $(sh $GITHUB_WORKSPACE/scripts/upload_services/${UPLOAD_SERVICE}.sh $GITHUB_WORKSPACE/build/${PRODUCT}-${VERSION}-${RELEASE}.amd64.snap)
echo "======no operation for you can see link in the log console====="
- name: Artifact Upload
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: Linux-distribution-artifact
path: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/MacOS-pack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:

steps:
- name: Checkout Source code
uses: actions/checkout@v1
uses: actions/checkout@v4

- name: Install Qt
run: brew install qt@5 cmake
Expand Down Expand Up @@ -78,7 +78,7 @@ jobs:
echo "=====no operation for you can see link in the log console====="
- name: Artifact Upload
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: MacOS-artifact
path: ${{ github.workspace }}/build/src/flameshot.dmg
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/Windows-pack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ jobs:
VCINSTALLDIR: C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/
Qt5_DIR: ${{ github.workspace }}\build\Qt\${{ matrix.qt_ver }}\${{ matrix.config.qt_arch_install }}\lib\cmake\Qt5\
QTDIR: ${{ github.workspace }}\build\Qt\${{ matrix.qt_ver }}\${{ matrix.config.qt_arch_install }}\
# 2020.07
VCPKG_VERSION: 56fffbe49dfb4dd8fae0940f272c5fd2b86be991
# 2022.06.15.1
VCPKG_VERSION: cef0b3ec767df6e83806899fe9525f6cf8d7bc91
VCPKG_PACKAGES: openssl-windows
OPENSSL_ROOT_DIR: ${{ github.workspace }}\vcpkg\installed\${{ matrix.config.vcpkg_triplet }}\
strategy:
Expand Down Expand Up @@ -54,14 +54,14 @@ jobs:
steps:
- name: Checkout Source code
if: github.event_name == 'push'
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
fetch-depth: 0
# ref: master

- name: Checkout Source code
if: github.event_name == 'pull_request'
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ github.event.pull_request.head.sha }}
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:

- name: Cache Qt
id: cache-qt
uses: actions/cache@v1
uses: actions/cache@v3
with:
path: ./build/Qt/${{ matrix.qt_ver }}/${{ matrix.config.qt_arch_install }}
key: ${{ runner.os }}-QtCache/${{ matrix.qt_ver }}/${{ matrix.config.qt_arch }}
Expand Down Expand Up @@ -197,7 +197,7 @@ jobs:
echo $(python $GITHUB_WORKSPACE/scripts/upload_services/transferwee.py upload $GITHUB_WORKSPACE/build/Package/portable/flameshot-${VERSION}-${{ matrix.config.pak_arch }}.zip)
echo "=====no operation for you can see link in the log console====="
- name: Artifact Upload
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: Windows-artifact
path: ${{ github.workspace }}/build/Package/*
8 changes: 4 additions & 4 deletions .github/workflows/build_cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ jobs:
steps:
- name: Checkout Source code
if: github.event_name == 'push'
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Checkout Source code
if: github.event_name == 'pull_request'
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}

Expand Down Expand Up @@ -97,11 +97,11 @@ jobs:
}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Cache Qt
id: cache-qt
uses: actions/cache@v1
uses: actions/cache@v3
with:
path: ./build/Qt
key: ${{ runner.os }}-QtCache
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/clang-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ jobs:
steps:
- name: Checkout Source code
if: github.event_name == 'push'
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Checkout Source code
if: github.event_name == 'pull_request'
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
- uses: DoozyX/clang-format-lint-action@v0.9
- uses: DoozyX/clang-format-lint-action@v0.13
with:
source: './src'
extensions: 'h,cpp'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy-dev-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
git+https://github.com/veracioux/[email protected]
- name: Checkout flameshot source
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: 'flameshot'

Expand All @@ -32,7 +32,7 @@ jobs:
make build
- name: Checkout flameshot website
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: 'flameshot-org/flameshot-org.github.io'
ref: 'gh-pages'
Expand Down

0 comments on commit 55dbc3a

Please sign in to comment.