Skip to content

Commit

Permalink
Merge branch 'main' into 14464-first-four-tables
Browse files Browse the repository at this point in the history
  • Loading branch information
mostlikelee committed Oct 26, 2023
2 parents b0683f6 + a5fff55 commit 1550b11
Show file tree
Hide file tree
Showing 148 changed files with 2,269 additions and 1,591 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/smoke-tests.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ Using the migration scripts located in fleet/test/upgrade/
<tr><td>Release blockers</td><td>Verify there are no outstanding release blocking tickets.</td><td>

1. Check [this](https://github.com/fleetdm/fleet/labels/~release%20blocker) filter to view all open `~release blocker` tickets.
2. If any are found raise an alarm in the `#help-engineering` and `#help-product` channels.
2. If any are found raise an alarm in the `#help-engineering` and `#help-product-design` channels.
</td><td>pass/fail</td></tr>
</table>

Expand Down
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/story.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ assignees: ''

### Engineering
- [ ] Database schema migrations: TODO <!-- Specify what changes to the database schema are required. (This willl be used to change migration scripts accordingly.) Remove this checkbox if there are no changes necessary. -->
- [ ] Documentation changes complete

> ℹ️  Please read this issue carefully and understand it. Pay [special attention](https://fleetdm.com/handbook/company/development-groups#developing-from-wireframes) to UI wireframes, especially "dev notes".
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-and-push-fleetctl-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
with:
go-version: 1.21.1
go-version: 1.21.3

- name: Install Go Dependencies
run: make deps-go
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-binaries.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
with:
go-version: 1.21.1
go-version: 1.21.3

- name: Checkout Code
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-orbit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
with:
go-version: 1.21.1
go-version: 1.21.3

- name: Build, codesign and notarize orbit
run: go run ./orbit/tools/build/build.go
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/fleet-and-orbit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
timeout-minutes: 60
strategy:
matrix:
go-version: ['^1.21.1']
go-version: ['^1.21.3']
mysql: ['mysql:5.7']
runs-on: ubuntu-latest
needs: gen
Expand Down Expand Up @@ -161,7 +161,7 @@ jobs:
timeout-minutes: 60
strategy:
matrix:
go-version: ['^1.21.1']
go-version: ['^1.21.3']
runs-on: ubuntu-latest
needs: gen
steps:
Expand Down Expand Up @@ -201,7 +201,7 @@ jobs:
build-macos-targets:
strategy:
matrix:
go-version: ['^1.21.1']
go-version: ['^1.21.3']
runs-on: macos-latest
steps:

Expand Down Expand Up @@ -243,7 +243,7 @@ jobs:
timeout-minutes: 60
strategy:
matrix:
go-version: ['^1.21.1']
go-version: ['^1.21.3']
runs-on: ubuntu-latest
needs: [gen, build-macos-targets]
steps:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/generate-desktop-targets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
with:
go-version: '^1.21.1'
go-version: '^1.21.3'

- name: Checkout
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
with:
go-version: '^1.21.1'
go-version: '^1.21.3'

- name: Checkout
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
Expand All @@ -108,7 +108,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
with:
go-version: '^1.21.1'
go-version: '^1.21.3'

- name: Checkout
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
matrix:
# See #9943, we just need to add windows-latest here once all issues are fixed.
os: [ubuntu-latest, macos-latest]
go-version: ['1.21.1']
go-version: ['1.21.3']
runs-on: ${{ matrix.os }}
steps:
- name: Checkout code
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/goreleaser-snapshot-fleet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ name: Docker publish

on:
push:
branches:
- 'main'
- 'prepare-*'
- 'patch-*'
paths-ignore:
- 'handbook/**'
- 'website/**'
Expand Down Expand Up @@ -48,7 +52,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
with:
go-version: 1.21.1
go-version: 1.21.3

- name: Install Dependencies
run: make deps
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
with:
go-version: '^1.21.1'
go-version: '^1.21.3'

- name: Checkout Code
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scorecards-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
persist-credentials: false

- name: "Run analysis"
uses: ossf/scorecard-action@e38b1902ae4f44df626f11ba0734b14fb91f8f86 # v2.1.2
uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
with:
results_file: results.sarif
results_format: sarif
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-db-changes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
with:
go-version: '^1.21.1'
go-version: '^1.21.3'
- name: Checkout Code
uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 # v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-go.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
go-version: ['^1.21.1']
go-version: ['^1.21.3']
mysql: ["mysql:5.7.21", "mysql:8.0.28"]
runs-on: ${{ matrix.os }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-native-tooling-packaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
go-version: ['^1.21.1']
go-version: ['^1.21.3']
runs-on: ${{ matrix.os }}

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-packaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest]
go-version: ['^1.21.1']
go-version: ['^1.21.3']
runs-on: ${{ matrix.os }}

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-yml-specs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
go-version: ['^1.21.1']
go-version: ['^1.21.3']
runs-on: ${{ matrix.os }}

steps:
Expand Down
2 changes: 1 addition & 1 deletion articles/end-user-self-remediation.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ There’s no one-size-fits-all approach for successful end user self-remediation

The benefits of self-remediation go beyond security. By making computer problems more approachable, you’ll empower employees to be more confident end users. So, they might be more inclined to troubleshoot issues before making a request.

See how easy implementing end user self-remediation can be. [Sign up for Sandbox](https://fleetdm.com/try-fleet/register) to try Fleet on your device for free.
See how easy implementing end user self-remediation can be. [Try `fleetctl preview`](https://fleetdm.com/try-fleet/register) to test Fleet on your device for free.

<meta name="category" value="security">
<meta name="authorFullName" value="Chris McGillicuddy">
Expand Down
38 changes: 38 additions & 0 deletions articles/expeditioners-charles-edge.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# ExpedITioners Podcast
## Charles Edge: The past, present, and future of all things computing and device management.

<iframe allow="autoplay *; encrypted-media *; fullscreen *; clipboard-write" frameborder="0" height="175" style="width:100%;max-width:660px;overflow:hidden;background:transparent;" sandbox="allow-forms allow-popups allow-same-origin allow-scripts allow-storage-access-by-user-activation allow-top-navigation-by-user-activation" src="https://embed.podcasts.apple.com/us/podcast/charles-edge-the-past-present-and-future-of/id1641183838?i=1000632334146"></iframe>

Listen to the episode on [Apple](https://podcasts.apple.com/us/podcast/charles-edge-the-past-present-and-future-of/id1641183838?i=1000632334146), [Spotify](https://open.spotify.com/episode/1hrR28oZBl2qg11ewrlZQC?si=S2nnbfdBSFyRsTAivA7fjg), or [PodBean](https://expeditioners.podbean.com/e/charles-edge-the-past-present-and-future-of-all-things-computing-and-device-management/).

### Show notes: 

On this episode, we have Charles Edge, also known as the "Old School Mac Guy," who not only hosts the MacAdmins Podcast but also serves as the Chief Technology Officer at Boostrappers.mn. He is dedicated to pioneering innovative approaches in the realms of Apple technology, security, and IT management software. Join us as Charles shares insights into the future of MDM and device management

### Topics discussed:

- Charles’ start in the MacAdmin world.
- Wingdings.
- Building an MDM.
- Enjoying the business, financial, and technical sides of IT management.
- Secret Chest and DND spells
- Writing a 2,000-page textbook on the history of computing.
- What the biggest changes for IT and MacAdmins will be.
- The future of MDM.

### Resources mentioned:

- [Secret Chest](https://www.secret-chest.com/)
- [Mac Admins Podcast](https://podcast.macadmins.org/)


### Where to get in touch:

- [LinkedIn](https://www.linkedin.com/in/charlesedge/)

<meta name="category" value="podcasts">
<meta name="authorGitHubUsername" value="zwass">
<meta name="authorFullName" value="Zach Wasserman">
<meta name="publishedOn" value="2023-10-23">
<meta name="articleTitle" value="ExpedITioners podcast with Charles Edge">
<meta name="articleImageUrl" value="../website/assets/images/articles/expeditioners-podcast-ep5-1600x900@2x.jpg">
Loading

0 comments on commit 1550b11

Please sign in to comment.