Skip to content

Commit

Permalink
Merge branch 'FreeCAD:master' into update-kde-neon-deps
Browse files Browse the repository at this point in the history
  • Loading branch information
furgo16 authored Oct 16, 2024
2 parents 6a47f1a + d5b5b8e commit ba60fc1
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 3 deletions.
31 changes: 29 additions & 2 deletions .github/workflows/publish-daily.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,43 @@ on:

jobs:
publish_amd64:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- name: install snapcraft
run: sudo snap install snapcraft --classic
- name: build snap
continue-on-error: true
run: |
sudo snapcraft --destructive-mode
sudo snapcraft --destructive-mode --verbose
sudo rm -rf $HOME/.config/snapcraft
- name: Copy snapcraft logs
continue-on-error: true
run: |
sudo cp -r /root/.local/state/snapcraft/log/ ./
- name: Upload log artifact
continue-on-error: true
uses: actions/upload-artifact@v4
with:
name: snapcraft-log
path: log/*

- name: publish snap
if: github.repository_owner == 'FreeCAD' # Do not run on forks
env:
SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.STORE_LOGIN }}
run: snapcraft upload --release=edge freecad*.snap

- name: Gather snap package name
run: |
snapArtifactPath=$(find . -type f -name *.snap)
echo "Snap package name is: '$snapArtifactPath'"
echo "snapArtifactPath=$snapArtifactPath" >> $GITHUB_ENV
- name: Upload snap package artifact
uses: actions/upload-artifact@v4
with:
name: snap-package
path: ${{ env.snapArtifactPath }}
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# See https://pre-commit.com/hooks.html for more hooks
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: 2c9f875913ee60ca25ce70243dc24d5b6415598c # frozen: v4.6.0
rev: cef0300fd0fc4d2a87a85fa2093c6b283ea36f4b # frozen: v5.0.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
Expand Down
1 change: 1 addition & 0 deletions snap/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,7 @@ parts:
- libsuitesparseconfig5 # scikit-sparse
python-packages:
- ifcopenshell # BIM
- opencamlib # CAM
- pip
- scikit-sparse
stage:
Expand Down

0 comments on commit ba60fc1

Please sign in to comment.