Skip to content

Commit 855e3b0

Browse files
committed
Merge branch 'main' into removeLatestVersionFile
2 parents 18166f8 + 4a8388a commit 855e3b0

File tree

2 files changed

+48
-64
lines changed

2 files changed

+48
-64
lines changed

.github/workflows/nightly.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ jobs:
2828
CCACHE_SLOPPINESS: time_macros
2929
SCCACHE_GHA_ENABLED: "true"
3030
steps:
31-
- uses: actions/checkout@v4
31+
- uses: actions/checkout@v5
3232

3333
- name: Set up ccache for ${{ matrix.arch }}
34-
uses: actions/[email protected].3
34+
uses: actions/[email protected].4
3535
with:
3636
path: ${{ env.CCACHE_DIR }}
3737
key: ${{ runner.os }}-ccache-nightly-${{ matrix.arch }}-${{ github.sha }}
@@ -74,15 +74,15 @@ jobs:
7474
runs-on: ubuntu-latest
7575

7676
steps:
77-
- uses: actions/download-artifact@v4.3.0
77+
- uses: actions/download-artifact@v5.0.0
7878
with:
7979
name: AppImage-x86_64
8080

81-
- uses: actions/download-artifact@v4.3.0
81+
- uses: actions/download-artifact@v5.0.0
8282
with:
8383
name: AppImage-aarch64
8484

85-
- uses: actions/download-artifact@v4.3.0
85+
- uses: actions/download-artifact@v5.0.0
8686
with:
8787
name: version
8888

@@ -99,7 +99,7 @@ jobs:
9999
continue-on-error: true
100100

101101
- name: Release nightly build
102-
uses: softprops/action-gh-release@v2.2.2
102+
uses: softprops/action-gh-release@v2.3.3
103103
with:
104104
name: "Nightly Build (${{ env.DATE }})"
105105
tag_name: "nightly"

.github/workflows/release.yml

Lines changed: 42 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -28,71 +28,55 @@ jobs:
2828
CCACHE_SLOPPINESS: time_macros
2929
SCCACHE_GHA_ENABLED: "true"
3030
steps:
31-
- uses: actions/checkout@v4
32-
33-
- name: Set up ccache for ${{ matrix.arch }}
34-
uses: actions/[email protected]
35-
with:
36-
path: ${{ env.CCACHE_DIR }}
37-
key: ${{ runner.os }}-ccache-release-${{ matrix.arch }}-${{ github.sha }}
38-
restore-keys: |
39-
${{ runner.os }}-ccache-release-${{ matrix.arch }}-
40-
41-
- name: set up sccache-cache
42-
uses: mozilla-actions/[email protected]
43-
44-
- name: Get dependencies
45-
if: always()
46-
run: chmod +x ./get-dependencies.sh && ./get-dependencies.sh
47-
48-
- name: Make AppImage
49-
run: chmod +x ./ares-appimage.sh && ./ares-appimage.sh
50-
51-
- name: Upload artifact
52-
uses: actions/[email protected]
53-
with:
54-
name: AppImage-${{ matrix.arch }}
55-
path: "dist"
56-
57-
- name: Upload version file
58-
uses: actions/[email protected]
59-
with:
60-
name: version
61-
path: ~/version
62-
overwrite: true
31+
- uses: actions/checkout@v5
32+
33+
- name: Set up ccache for ${{ matrix.arch }}
34+
uses: actions/[email protected]
35+
with:
36+
path: ${{ env.CCACHE_DIR }}
37+
key: ${{ runner.os }}-ccache-release-${{ matrix.arch }}-${{ github.sha }}
38+
restore-keys: |
39+
${{ runner.os }}-ccache-release-${{ matrix.arch }}-
40+
41+
- name: set up sccache-cache
42+
uses: mozilla-actions/[email protected]
43+
44+
- name: Get dependencies
45+
if: always()
46+
run: chmod +x ./get-dependencies.sh && ./get-dependencies.sh
6347

6448
release:
6549
if: ${{ github.ref_name == 'main' }}
6650
needs: [build]
6751
permissions: write-all
6852
runs-on: ubuntu-latest
6953

70-
steps:
71-
- uses: actions/[email protected]
72-
with:
73-
name: AppImage-x86_64
74-
75-
- uses: actions/[email protected]
76-
with:
77-
name: AppImage-aarch64
54+
steps:
55+
- uses: actions/[email protected]
56+
with:
57+
name: AppImage-x86_64
7858

79-
- uses: actions/download-artifact@v4.3.0
80-
with:
81-
name: version
59+
- uses: actions/download-artifact@v5.0.0
60+
with:
61+
name: AppImage-aarch64
8262

83-
- name: Read version and Get date
84-
run: |
85-
echo "VERSION=$(cat version)" >> "${GITHUB_ENV}"
86-
echo "DATE=$(date +'%Y-%m-%d_%s')" >> "${GITHUB_ENV}"
63+
- uses: actions/[email protected]
64+
with:
65+
name: version
66+
67+
- name: Read version and Get date
68+
run: |
69+
echo "VERSION=$(cat version)" >> "${GITHUB_ENV}"
70+
echo "DATE=$(date +'%Y-%m-%d_%s')" >> "${GITHUB_ENV}"
8771
88-
- name: Release Artifacts
89-
uses: softprops/action-gh-release@v2.2.2
90-
with:
91-
name: "ares: ${{ env.VERSION }}"
92-
tag_name: "${{ env.VERSION }}@${{ env.DATE }}"
93-
prerelease: false
94-
draft: false
95-
generate_release_notes: false
96-
make_latest: true
97-
files: |
98-
*.AppImage*
72+
- name: Release Artifacts
73+
uses: softprops/action-gh-release@v2.3.3
74+
with:
75+
name: "ares: ${{ env.VERSION }}"
76+
tag_name: "${{ env.VERSION }}@${{ env.DATE }}"
77+
prerelease: false
78+
draft: false
79+
generate_release_notes: false
80+
make_latest: true
81+
files: |
82+
*.AppImage*

0 commit comments

Comments
 (0)