Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix update cis #3587

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix update cis #3587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe07423
better GithubAction trigger conditions
mmahmoudian Apr 28, 2024
21ce549
migrate most GithubAction Workflow Runners to latest version
mmahmoudian Apr 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions .github/workflows/Linux-pack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,24 @@ name: Packaging(Linux)

on:
push:
branches:
- master
branches: [ master ]
paths-ignore:
- 'README.md'
- 'LICENSE'
- 'CODE_OF_CONDUCT.md'
- 'shell.nix'
- 'docs/**'

pull_request:
branches: [ master ]
paths-ignore:
- 'README.md'
- 'LICENSE'
- 'CODE_OF_CONDUCT.md'
- 'shell.nix'
- 'docs/**'

workflow_dispatch:

env:
PRODUCT: flameshot
Expand Down Expand Up @@ -555,7 +563,7 @@ jobs:
echo "================================"
echo "VERSION=${last_committed_tag:1}" >> $GITHUB_ENV
- name: Packaging snap
uses: snapcore/action-build@v1
uses: snapcore/action-build@v1.2.0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
uses: snapcore/action-build@v1.2.0
uses: snapcore/action-build@v1

v1 will install latest v1 version ;)

id: snapcraft
with:
snapcraft-args: --enable-experimental-extensions
Expand Down
13 changes: 10 additions & 3 deletions .github/workflows/MacOS-pack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,24 @@ name: Packaging(MacOS)

on:
push:
branches:
- master
- feature/RND-680-macos-.dmg-package-build
branches: [ master ]
paths-ignore:
- 'README.md'
- 'LICENSE'
- 'CODE_OF_CONDUCT.md'
- 'shell.nix'
- 'docs/**'

pull_request:
branches: [ master ]
paths-ignore:
- 'README.md'
- 'LICENSE'
- 'CODE_OF_CONDUCT.md'
- 'shell.nix'
- 'docs/**'

workflow_dispatch:

env:
PRODUCT: flameshot
Expand Down
18 changes: 12 additions & 6 deletions .github/workflows/Windows-pack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,23 @@ name: Packaging(Windows)

on:
push:
branches:
- master
- fix*
branches: [ master ]
paths-ignore:
- 'README.md'
- 'LICENSE'
- 'CODE_OF_CONDUCT.md'
- 'shell.nix'
- 'docs/**'

pull_request:
branches: [ master ]
paths-ignore:
- 'README.md'
- 'LICENSE'
- 'CODE_OF_CONDUCT.md'
- 'shell.nix'
- 'docs/**'

workflow_dispatch:


Expand Down Expand Up @@ -84,7 +90,7 @@ jobs:
echo "VERSION=$(cat CMakeLists.txt |grep 'set.*(.*FLAMESHOT_VERSION' | sed 's/[^0-9.]*//' |sed 's/)//g')" >> $GITHUB_ENV

- name: Restore from cache and run vcpkg
uses: lukka/run-vcpkg@v11
uses: lukka/run-vcpkg@v11.5
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
uses: lukka/run-vcpkg@v11.5
uses: lukka/run-vcpkg@v11

with:
vcpkgArguments: ${{env.VCPKG_PACKAGES}}
vcpkgDirectory: '${{ github.workspace }}\vcpkg'
Expand All @@ -94,13 +100,13 @@ jobs:

- name: Cache Qt
id: cache-qt
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ./build/Qt/${{ matrix.qt_ver }}/${{ matrix.config.qt_arch_install }}
key: ${{ runner.os }}-QtCache/${{ matrix.qt_ver }}/${{ matrix.config.qt_arch }}

- name: Install Qt
uses: jurplel/install-qt-action@v2
uses: jurplel/install-qt-action@v3.3.0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
uses: jurplel/install-qt-action@v3.3.0
uses: jurplel/install-qt-action@v3

with:
version: ${{ matrix.qt_ver }}
target: ${{ matrix.qt_target }}
Expand Down
13 changes: 11 additions & 2 deletions .github/workflows/build_cmake.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,20 @@ on:
paths-ignore:
- 'README.md'
- 'LICENSE'
- 'CODE_OF_CONDUCT.md'
- 'shell.nix'
- 'docs/**'

pull_request:
branches: [ master ]
paths-ignore:
- 'README.md'
- 'LICENSE'
- 'CODE_OF_CONDUCT.md'
- 'shell.nix'
- 'docs/**'

workflow_dispatch:

env:
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
Expand Down Expand Up @@ -101,13 +110,13 @@ jobs:

- name: Cache Qt
id: cache-qt
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ./build/Qt
key: ${{ runner.os }}-QtCache

- name: Install Qt
uses: jurplel/install-qt-action@v2
uses: jurplel/install-qt-action@v3.3.0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
uses: jurplel/install-qt-action@v3.3.0
uses: jurplel/install-qt-action@v3

with:
version: 5.15.2
target: desktop
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/clang-format.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
- uses: DoozyX/clang-format-lint-action@v0.13
- uses: DoozyX/clang-format-lint-action@v0.17
with:
source: './src'
extensions: 'h,cpp'
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/deploy-dev-docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ on:
- 'docs/dev/**'
- '.github/workflows/deploy-dev-docs.yml'

workflow_dispatch:

jobs:
build-and-deploy:
runs-on: ubuntu-22.04
Expand Down
Loading