Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CI for copyright header #16

Merged
merged 1 commit into from
Jan 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2024 Apple Inc. and the Swift Homomorphic Encryption project authors
# Copyright 2024-2025 Apple Inc. and the Swift Homomorphic Encryption project authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -35,7 +35,20 @@ jobs:
- name: Install pre-commit
run: pip install pre-commit
- name: Pre-commit checks
# CI will commit to `main`
# CI will commit to `main`, insert-license tested separately
run: >
SKIP=no-commit-to-branch
SKIP=no-commit-to-branch,insert-license
pre-commit run --all-files
insert-license:
timeout-minutes: 1
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 2
- name: Install pre-commit
run: pip install pre-commit
- name: List changed files
run: git diff --name-only HEAD~1
- name: Run license check
run: pre-commit run insert-license --files $(git diff --name-only HEAD~1)
10 changes: 6 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2024 Apple Inc. and the Swift Homomorphic Encryption project authors
# Copyright 2024-2025 Apple Inc. and the Swift Homomorphic Encryption project authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -14,7 +14,7 @@

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
rev: v5.0.0
hooks:
- id: fix-byte-order-marker
- id: check-case-conflict
Expand All @@ -28,7 +28,7 @@ repos:
- id: no-commit-to-branch
args: [--branch, main]
- repo: https://github.com/crate-ci/typos
rev: v1.22.9
rev: v1.29.3
hooks:
- id: typos
- repo: https://github.com/Lucas-C/pre-commit-hooks
Expand All @@ -43,15 +43,17 @@ repos:
- --comment-style
- //
- --allow-past-years
- --use-current-year
- id: insert-license
name: insert-license-yaml
'types_or': [yaml]
args:
- --license-filepath
- copyright-header.txt
- --allow-past-years
- --use-current-year
- repo: https://github.com/bufbuild/buf
rev: v1.36.0
rev: v1.48.0
hooks:
- id: buf-lint
- id: buf-format
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ Thanks for your interest in contributing.
We would love contributions in the form of feedback via [GitHub Issues](https://github.com/apple/swift-homomorphic-encryption-protobuf/issues), pull requests with new features, bug fixes, documentation (including fixing typos!), and your ideas.
If it's a big change, please start with an Issue.

Before contributing, please run [`pre-commit`](https://pre-commit.com), e.g. via `pre-commit run --all-files`. This will perform some basic formatting checks.

To install `pre-commit`, follow instructions in https://pre-commit.com/. We recommend `brew install pre-commit`.
Before contributing, please install [`pre-commit`](https://pre-commit.com), e.g. via `brew install pre-commit`.
Then run `pre-commit install` to install pre-commit for the repository.
Then on each commit, some basic formatting checks will be run.

### Pull Requests:
Before making a commit for a pull request, please run `pre-commit install`.
Expand Down
Loading