Skip to content

Commit

Permalink
Merge branch 'main' into usr-etc-to-usr
Browse files Browse the repository at this point in the history
  • Loading branch information
KyleGospo authored Aug 8, 2024
2 parents 72b519e + 786a1ec commit e2c9907
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/reusable-build-iso.yml
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ jobs:
- name: Upload ISOs and Checksum to Job Artifacts
if: github.ref_name == 'testing'
#if: github.event_name == 'pull_request'
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4
with:
name: ${{ steps.build.outputs.iso_name }}
path: ${{ steps.upload-directory.outputs.iso-upload-dir }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/reusable-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}

# Sign container
- uses: sigstore/cosign-installer@59acb6260d9c0ba8f4a2f9d9b48431a222b68e20 # v3.5.0
- uses: sigstore/cosign-installer@4959ce089c160fddf62f7b42464195ba1a56d382 # v3.6.0
if: github.event_name != 'pull_request'

- name: Sign container image
Expand All @@ -425,7 +425,7 @@ jobs:

- name: Upload artifact
if: github.event_name != 'pull_request'
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4
with:
name: image-${{ env.IMAGE_NAME }}-${{ env.image_flavor }}-${{ matrix.fedora_version }}
retention-days: 1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable-image-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
echo "name=$(echo ${IMAGE} | awk -F'/' '{print $NF}' | sed 's/:/-/g')" >> $GITHUB_OUTPUT
- name: Upload scan results
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4
with:
name: security-${{ steps.artifact-name.outputs.name }}
if-no-files-found: error
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
[chrome-dev]
Description=chrome-dev
desktopfile=com.google.ChromeDev
desktopfilerule=3
wmclass=google-chrome-unstable
wmclassmatch=1

[chrome-fix]
Description=chrome-fix
desktopfile=com.google.Chrome
desktopfilerule=3
wmclass=google-chrome
wmclassmatch=1

[steam-flathub-fix]
Description=steam-flathub-fix
desktopfile=com.valvesoftware.Steam
desktopfilerule=3
wmclass=steamwebhelper SDL Application
wmclasscomplete=true
wmclassmatch=1
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ brew "gh"
brew "glab"
brew "rg"
brew "shellcheck"
brew "tealdeer"
brew "ugrep"
brew "yq"
brew "zoxide"
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
wireplumber.profiles = {
main = {
monitor.libcamera = disabled
}
}

0 comments on commit e2c9907

Please sign in to comment.