Skip to content

Commit

Permalink
Merge pull request #32 from Jamf-Custom-Profile-Schemas/pre-commit-up…
Browse files Browse the repository at this point in the history
…date

Update pre-commit config and update references to ProfileManifests repo, which is now in its own organization
  • Loading branch information
homebysix authored Nov 18, 2024
2 parents 9934eae + f17225f commit 08a3384
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Clone profilecreator-schemas repository
- name: Clone profilemanifests-schemas repository
uses: actions/checkout@v2
with:
ref: main
Expand All @@ -20,7 +20,7 @@ jobs:
uses: actions/checkout@v2
with:
ref: master
repository: ProfileCreator/ProfileManifests
repository: ProfileManifests/ProfileManifests
path: ProfileManifests

- name: Regenerate manifests and commit changes
Expand All @@ -37,5 +37,5 @@ jobs:
git config user.name github-actions
git config user.email [email protected]
git add -A
git commit -anm "Regenerate manifests" -m "Upstream diff: https://github.com/ProfileCreator/ProfileManifests/compare/$PREV..$HASH" || true
git commit -anm "Regenerate manifests" -m "Upstream diff: https://github.com/ProfileManifests/ProfileManifests/compare/$PREV..$HASH" || true
git push --set-upstream origin main || true
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
rev: v5.0.0
hooks:
- id: check-added-large-files
args: [--maxkb=100]
Expand All @@ -20,7 +20,7 @@ repos:
- id: trailing-whitespace
args: [--markdown-linebreak-ext=md]
- repo: https://github.com/python/black
rev: 24.8.0
rev: 24.10.0
hooks:
- id: black
- repo: https://github.com/pre-commit/mirrors-isort
Expand All @@ -32,12 +32,12 @@ repos:
hooks:
- id: flake8
- repo: https://github.com/asottile/pyupgrade
rev: v3.17.0
rev: v3.19.0
hooks:
- id: pyupgrade
args: ['--py36-plus']
- repo: https://github.com/asottile/blacken-docs
rev: 1.18.0
rev: 1.19.1
hooks:
- id: blacken-docs
additional_dependencies: [black==24.4.2]
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[![Build Status Badge](https://github.com/Jamf-Custom-Profile-Schemas/ProfileManifestsMirror/actions/workflows/build.yml/badge.svg)](https://github.com/Jamf-Custom-Profile-Schemas/ProfileManifestsMirror/actions/workflows/build.yml)
![Manifest Count](https://img.shields.io/badge/manifests-253-blue)

This repository contains Jamf JSON schema manifests automatically generated from the repository of [ProfileCreator manifests](https://github.com/ProfileCreator/ProfileManifests).
This repository contains Jamf JSON schema manifests automatically generated from the repository of [ProfileManifests](https://github.com/ProfileManifests/ProfileManifests).

To find a manifest on this repo's GitHub page, type `T` and then type part of the preference domain for the app you wish to manage.

Expand All @@ -13,7 +13,7 @@ Because these manifests have been automatically generated by a relatively new bu

## Submit _manifest_ changes upstream

Any corrections, additions, or modifications to the manifests in this repository should be submitted upstream to the [ProfileManifests](https://github.com/ProfileCreator/ProfileManifests) repository. Once pull requests are merged there, subsequent builds of this repository will include the changes.
Any corrections, additions, or modifications to the manifests in this repository should be submitted upstream to the [ProfileManifests](https://github.com/ProfileManifests/ProfileManifests) repository. Once pull requests are merged there, subsequent builds of this repository will include the changes.

## Submit _build script_ changes here

Expand Down
8 changes: 4 additions & 4 deletions build.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

"""Given a path to a folder containing ProfileCreator manifests, this script aims to produce
"""Given a path to a folder containing profile manifests, this script aims to produce
equivalent Jamf JSON schema manifests."""


Expand All @@ -39,7 +39,7 @@ def build_argument_parser():
parser.add_argument(
"input_dir",
action="store",
help="path to a directory containing ProfileCreator manifests to be converted",
help="path to a directory containing profile manifests to be converted",
)
parser.add_argument(
"-o",
Expand Down Expand Up @@ -100,7 +100,7 @@ def validate_args(args):


def read_manifest_plist(path):
"""Given a path to a ProfileCreator manifest plist, return the contents of
"""Given a path to a profile manifest plist, return the contents of
the plist."""
with open(path, "rb") as openfile:
try:
Expand Down Expand Up @@ -220,7 +220,7 @@ def process_subkeys(subkeys):


def convert_to_jamf_manifest(data, property_order_increment=5):
"""Convert a ProfileCreator plist object to a Jamf JSON schema manifest.
"""Convert a profile manifest plist object to a Jamf JSON schema manifest.
Reference: https://docs.jamf.com/technical-papers/jamf-pro/json-schema/10.19.0/Understanding_the_Structure_of_a_JSON_Schema_Manifest.html
"""
Expand Down

0 comments on commit 08a3384

Please sign in to comment.