Skip to content

Commit 2aaaf92

Browse files
sgress454sgress454
authored
Sgress454/update rc patch fleet v4.52.3 (#26910)
get 4.53.2 patch to build
1 parent 7b1df75 commit 2aaaf92

23 files changed

+54
-705
lines changed

‎.github/workflows/build-binaries.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545

4646
- name: JS Dependency Cache
4747
id: js-cache
48-
uses: actions/cache@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 # v2
48+
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57
4949
with:
5050
path: |
5151
**/node_modules
@@ -57,7 +57,7 @@ jobs:
5757
5858
- name: Go Cache
5959
id: go-cache
60-
uses: actions/cache@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 # v2
60+
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57
6161
with:
6262
# In order:
6363
# * Module download cache
@@ -89,7 +89,7 @@ jobs:
8989
- name: Build binaries
9090
run: make
9191

92-
- uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v2
92+
- uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b
9393
with:
9494
name: build
9595
path: build/

‎.github/workflows/build-orbit.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
ORBIT_COMMIT: ${{ github.sha }}
7474

7575
- name: Upload orbit
76-
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v2
76+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b
7777
with:
7878
name: orbit
7979
path: |

‎.github/workflows/fleet-and-orbit.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -157,15 +157,15 @@ jobs:
157157

158158
- name: Upload fleet logs
159159
if: always()
160-
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v2
160+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b
161161
with:
162162
name: fleet-logs
163163
path: |
164164
fleet_log
165165
166166
- name: Upload cloudflared logs
167167
if: always()
168-
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v2
168+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b
169169
with:
170170
name: cloudflared.log
171171
path: cloudflared.log
@@ -248,7 +248,7 @@ jobs:
248248
make osqueryd-app-tar-gz version=$OSQUERY_VERSION out-path=.
249249
250250
- name: Upload desktop.app.tar.gz and osqueryd.app.tar.gz
251-
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v2
251+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b
252252
with:
253253
name: macos-pre-built-apps
254254
path: |
@@ -317,21 +317,21 @@ jobs:
317317
./tools/tuf/test/main.sh
318318
319319
- name: Upload PKG installer
320-
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v2
320+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b
321321
with:
322322
name: fleet-osquery.pkg
323323
path: |
324324
fleet-osquery.pkg
325325
326326
- name: Upload DEB installer
327-
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v2
327+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b
328328
with:
329329
name: fleet-osquery_42.0.0_amd64.deb
330330
path: |
331331
fleet-osquery_42.0.0_amd64.deb
332332
333333
- name: Upload MSI installer
334-
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v2
334+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b
335335
with:
336336
name: fleet-osquery.msi
337337
path: |
@@ -381,7 +381,7 @@ jobs:
381381
382382
- name: Upload orbit logs
383383
if: always()
384-
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v2
384+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b
385385
with:
386386
name: orbit-logs
387387
path: |
@@ -432,7 +432,7 @@ jobs:
432432
433433
- name: Upload orbit logs
434434
if: always()
435-
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v2
435+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b
436436
with:
437437
name: orbit-logs
438438
path: |
@@ -551,7 +551,7 @@ jobs:
551551
552552
- name: Upload Orbit logs
553553
if: always()
554-
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v2
554+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b
555555
with:
556556
name: orbit-logs-windows
557557
path: C:\Windows\system32\config\systemprofile\AppData\Local\FleetDM\Orbit\Logs\orbit-osquery.log

‎.github/workflows/fleetctl-preview-latest.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ jobs:
9595
9696
- name: Upload logs
9797
if: always()
98-
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v2
98+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b
9999
with:
100100
name: ${{ matrix.os }}-log
101101
path: |

‎.github/workflows/fleetctl-preview.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555

5656
- name: Upload logs
5757
if: always()
58-
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v2
58+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b
5959
with:
6060
name: ${{ matrix.os }}-log
6161
path: |

‎.github/workflows/generate-nudge-targets.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
run: make nudge-app-tar-gz version=$NUDGE_VERSION out-path=.
4646

4747
- name: Upload nudge.app.tar.gz
48-
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v2
48+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b
4949
with:
5050
name: nudge.app.tar.gz
5151
path: nudge.app.tar.gz

‎.github/workflows/generate-osqueryd-targets.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
make osqueryd-app-tar-gz out-path=. version=$OSQUERY_VERSION
4747
4848
- name: Upload osqueryd.app.tar.gz
49-
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v2
49+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b
5050
with:
5151
name: osqueryd.app.tar.gz
5252
path: osqueryd.app.tar.gz
@@ -71,7 +71,7 @@ jobs:
7171
./opt/osquery/bin/osqueryd --version
7272
7373
- name: Upload osqueryd for linux
74-
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v2
74+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b
7575
with:
7676
name: osqueryd
7777
path: opt/osquery/bin/osqueryd
@@ -98,7 +98,7 @@ jobs:
9898
C:\temp\osquery\osqueryd\osqueryd.exe --version
9999
100100
- name: Upload osqueryd for Windows
101-
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v2
101+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b
102102
with:
103103
name: osqueryd.exe
104104
path: C:\temp\osquery\osqueryd\osqueryd.exe

‎.github/workflows/goreleaser-fleet.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ jobs:
7676
uses: goreleaser/goreleaser-action@f82d6c1c344bcacabba2c841718984797f664a6b
7777
with:
7878
distribution: goreleaser-pro
79-
version: "~> 1"
80-
args: release --rm-dist -f .goreleaser.yml
79+
version: "~> 2.6.1"
80+
args: release --clean -f .goreleaser.yml
8181
env:
8282
GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
8383
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/goreleaser-orbit.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
go-version: ${{ vars.GO_VERSION }}
6060

6161
- name: Run GoReleaser
62-
run: go run github.com/goreleaser/goreleaser@56c9d09a1b925e2549631c6d180b0a1c2ebfac82 release --debug --rm-dist --skip-publish -f orbit/goreleaser-macos.yml # v1.20.0
62+
run: go run github.com/goreleaser/goreleaser/v2@606c0e724fe9b980cd01090d08cbebff63cd0f72 release --verbose --clean --skip=publish -f orbit/goreleaser-macos.yml # v2.4.4
6363
env:
6464
GITHUB_TOKEN: ${{ secrets.FLEET_RELEASE_GITHUB_PAT }}
6565
AC_USERNAME: ${{ secrets.APPLE_USERNAME }}
@@ -98,7 +98,7 @@ jobs:
9898
go-version: ${{ vars.GO_VERSION }}
9999

100100
- name: Run GoReleaser
101-
run: go run github.com/goreleaser/goreleaser@56c9d09a1b925e2549631c6d180b0a1c2ebfac82 release --debug --rm-dist --skip-publish -f orbit/goreleaser-linux.yml # v1.20.0
101+
run: go run github.com/goreleaser/goreleaser/v2@606c0e724fe9b980cd01090d08cbebff63cd0f72 release --verbose --clean --skip=publish -f orbit/goreleaser-linux.yml # v2.4.4
102102

103103
- name: Upload
104104
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # 4.3.3
@@ -131,7 +131,7 @@ jobs:
131131
go-version: ${{ vars.GO_VERSION }}
132132

133133
- name: Run GoReleaser
134-
run: go run github.com/goreleaser/goreleaser@56c9d09a1b925e2549631c6d180b0a1c2ebfac82 release --debug --rm-dist --skip-publish -f orbit/goreleaser-windows.yml # v1.20.0
134+
run: go run github.com/goreleaser/goreleaser/v2@606c0e724fe9b980cd01090d08cbebff63cd0f72 release --verbose --clean --skip=publish -f orbit/goreleaser-windows.yml # v2.4.4
135135

136136
- name: Upload
137137
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # 4.3.3

‎.github/workflows/goreleaser-snapshot-fleet.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ jobs:
7272
uses: goreleaser/goreleaser-action@f82d6c1c344bcacabba2c841718984797f664a6b
7373
with:
7474
distribution: goreleaser-pro
75-
version: "~> 1"
76-
args: release --snapshot --rm-dist -f .goreleaser-snapshot.yml
75+
version: "~> 2.6.1"
76+
args: release --snapshot --clean -f .goreleaser-snapshot.yml
7777
env:
7878
GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
7979

‎.github/workflows/integration.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ jobs:
134134

135135
- name: Upload cloudflared logs
136136
if: always()
137-
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v2
137+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b
138138
with:
139139
name: cloudflared.log
140140
path: cloudflared.log
@@ -230,7 +230,7 @@ jobs:
230230
231231
- name: Upload Orbit logs
232232
if: always()
233-
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v2
233+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b
234234
with:
235235
name: orbit-macos-${{ matrix.orbit-channel }}-${{ matrix.osqueryd-channel }}-${{ matrix.desktop-channel }}-logs
236236
path: |
@@ -300,7 +300,7 @@ jobs:
300300
301301
- name: Upload Orbit logs
302302
if: always()
303-
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v2
303+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b
304304
with:
305305
name: orbit-ubuntu-${{ matrix.orbit-channel }}-${{ matrix.osqueryd-channel }}-${{ matrix.desktop-channel }}-logs
306306
path: |
@@ -346,7 +346,7 @@ jobs:
346346
mv fleet-osquery.msi orbit-${{ matrix.orbit-channel }}-osqueryd-${{ matrix.osqueryd-channel }}-desktop-${{ matrix.desktop-channel }}.msi
347347
348348
- name: Upload MSI
349-
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v2
349+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b
350350
with:
351351
name: orbit-${{ matrix.orbit-channel }}-osqueryd-${{ matrix.osqueryd-channel }}-desktop-${{ matrix.desktop-channel }}.msi
352352
path: orbit-${{ matrix.orbit-channel }}-osqueryd-${{ matrix.osqueryd-channel }}-desktop-${{ matrix.desktop-channel }}.msi
@@ -394,14 +394,14 @@ jobs:
394394

395395
- name: Upload orbit install log
396396
if: always()
397-
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v2
397+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b
398398
with:
399399
name: msiexec-install-log
400400
path: log.txt
401401

402402
- name: Upload Orbit logs
403403
if: always()
404-
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v2
404+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b
405405
with:
406406
name: orbit-windows-${{ matrix.orbit-channel }}-${{ matrix.osqueryd-channel }}-${{ matrix.desktop-channel }}-logs
407407
path: C:\Windows\system32\config\systemprofile\AppData\Local\FleetDM\Orbit\Logs\orbit-osquery.log

‎.github/workflows/test-fleetd-chrome.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141

4242
- name: JS Dependency Cache
4343
id: js-cache
44-
uses: actions/cache@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 # v2
44+
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57
4545
with:
4646
path: |
4747
**/node_modules

‎.github/workflows/test-js.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252

5353
- name: JS Dependency Cache
5454
id: js-cache
55-
uses: actions/cache@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 # v2
55+
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57
5656
with:
5757
path: |
5858
**/node_modules
@@ -96,7 +96,7 @@ jobs:
9696

9797
- name: JS Dependency Cache
9898
id: js-cache
99-
uses: actions/cache@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 # v2
99+
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57
100100
with:
101101
path: |
102102
**/node_modules

‎.goreleaser-snapshot.yml

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
version: 2
2+
13
project_name: fleet
24

35
monorepo:

‎.goreleaser.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
version: 2
2+
13
project_name: fleet
24

35
monorepo:
@@ -136,10 +138,10 @@ checksum:
136138
name_template: 'checksums.txt'
137139

138140
snapshot:
139-
name_template: "{{ .Tag }}-untagged"
141+
version_template: "{{ .Tag }}-untagged"
140142

141143
changelog:
142-
skip: true
144+
disable: true
143145

144146
release:
145147
github:

0 commit comments

Comments
 (0)