Skip to content
Open
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
4 changes: 2 additions & 2 deletions .github/workflows/check-python-code.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@ jobs:
contents: read

steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
persist-credentials: false

- name: Install uv
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
with:
version: "latest"

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish-python-packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,20 +56,20 @@ jobs:
include: ${{ fromJson(needs.check.outputs.changed_packages) }}
steps:
- name: Install uv
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
with:
version: latest

- name: Check out code
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
persist-credentials: false

- name: Sync code to make packages visible to Python
run: uv sync --all-packages

- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@d979d5b3a71173a29b74b5b88418bfda9437d885 # v6.1.1
uses: aws-actions/configure-aws-credentials@e7f100cf4c008499ea8adda475de1042d6975c7b # v6.2.0
with:
aws-region: us-west-2
role-to-assume: arn:aws:iam::505071440022:role/GithubActions_Schema_CodeArtifact_Publish
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/rebase-vnext.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,10 @@ jobs:
client-id: Iv23liiN80WEARreTV7m
private-key: ${{ secrets.OVERTURE_PULL_REQUESTER_APP_PEM }} # zizmor: ignore[secrets-outside-env]
# Explicitly scope the app token instead of inheriting all installation permissions.
permission-contents: write
permission-issues: write
permission-pull-requests: read
permission-contents: write # force-push the rebased vnext; clone/fetch
permission-issues: write # open a failure issue on rebase conflict
permission-pull-requests: read # read PR on merge commit to detect vnext→main release
permission-workflows: write # vnext commits may touch .github/workflows/**

# Detect whether this push was a vnext→main release merge.
# The GitHub API returns the PR(s) associated with the merge commit.
Expand All @@ -64,7 +65,7 @@ jobs:
echo "pr_author=${PR_AUTHOR}" >> "$GITHUB_OUTPUT"
fi

- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
if: steps.skip.outputs.skip != 'true'
with:
fetch-depth: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,12 @@ jobs:
run: sudo apt-get update && sudo apt-get install -y jq

- name: Install uv
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
with:
version: latest

- name: Check out code before change
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
ref: ${{ inputs.before_commit }}
persist-credentials: false
Expand All @@ -93,7 +93,7 @@ jobs:
run: uv run python ./.github/workflows/scripts/package-versions.py collect > /tmp/package-versions-before.json

- name: Check out code after change
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
ref: ${{ inputs.after_commit }}
persist-credentials: false
Expand Down Expand Up @@ -124,7 +124,7 @@ jobs:

- name: Configure AWS credentials
if: steps.save-changes.outputs.num_changed_packages > 0
uses: aws-actions/configure-aws-credentials@d979d5b3a71173a29b74b5b88418bfda9437d885 # v6.1.1
uses: aws-actions/configure-aws-credentials@e7f100cf4c008499ea8adda475de1042d6975c7b # v6.2.0
with:
aws-region: ${{ inputs.aws_region }}
role-to-assume: arn:aws:iam::${{ inputs.aws_account_id }}:role/${{ inputs.aws_iam_role_name }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/schema-pr-preview-cleanup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:

steps:
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@d979d5b3a71173a29b74b5b88418bfda9437d885 # v6.1.1
uses: aws-actions/configure-aws-credentials@e7f100cf4c008499ea8adda475de1042d6975c7b # v6.2.0
with:
role-to-assume: ${{ env.AWS_ROLE_ARN }}
aws-region: ${{ env.AWS_REGION }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/schema-pr-preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ jobs:
SCHEMA_PREVIEW: 'true'
steps:
- name: Check out schema repo
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
persist-credentials: false

- name: Check out docs repo
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
repository: OvertureMaps/docs
path: ${{ env.DOCS_PATH }}
Expand Down Expand Up @@ -94,7 +94,7 @@ jobs:

steps:
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@d979d5b3a71173a29b74b5b88418bfda9437d885 # v6.1.1
uses: aws-actions/configure-aws-credentials@e7f100cf4c008499ea8adda475de1042d6975c7b # v6.2.0
with:
role-to-assume: ${{ env.AWS_ROLE_ARN }}
aws-region: ${{ env.AWS_REGION }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-schema.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
contents: read

steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
persist-credentials: false

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/vnext-compat.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
contents: read
pull-requests: write # Required to post conflict resolution instructions as a PR comment
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
fetch-depth: 0
persist-credentials: false
Expand Down
16 changes: 16 additions & 0 deletions counterexamples/buildings/bad-sources-empty-provider.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
id: overture:buildings:building:1234
type: Feature
geometry:
type: Polygon
coordinates: [[[0, 0], [0, 1], [1, 1], [1, 0], [0, 0]]]
properties:
theme: buildings
type: building
version: 1
sources:
- dataset: MyGreatDataset
property: "/geometry"
provider: ""
resource: ""
version: ""
26 changes: 26 additions & 0 deletions examples/buildings/sources-with-version.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
---
id: overture:buildings:building:1234
type: Feature
geometry:
type: Polygon
coordinates: [[[0, 0], [0, 1], [1, 1], [1, 0], [0, 0]]]
properties:
theme: buildings
type: building
version: 1
sources:
- property: "/geometry"
dataset: osm-planet
provider: osm
resource: planet
version: '2078-08-28T14:44:41Z'
- property: "/properties/name"
dataset: metaML-buildings
provider: meta
resource: ml_buildings
version: 'abcdef'
- property: "/properties/height"
dataset: microsoft-buildings
provider: microsoft
resource: buildings
version: '352'
Original file line number Diff line number Diff line change
Expand Up @@ -54,16 +54,37 @@
"title": "Property",
"type": "string"
},
"provider": {
"description": "The provider label for the entity that contributed this data\n(e.g., osm, meta, esri).",
"minLength": 1,
"pattern": "^[a-z0-9]+(_[a-z0-9]+)*$",
"title": "Provider",
"type": "string"
},
"record_id": {
"description": "Identifies the specific record within the source dataset where the source data can\nbe found.\n\nThe format of record identifiers is dataset-specific.",
"title": "Record Id",
"type": "string"
},
"resource": {
"description": "The subject or type of data contributed by the provider\n(e.g., planet, buildings, division_names).",
"minLength": 1,
"pattern": "^[a-z0-9]+(_[a-z0-9]+)*$",
"title": "Resource",
"type": "string"
},
"update_time": {
"description": "Last update time of the source data record.",
"format": "date-time",
"title": "Update Time",
"type": "string"
},
"version": {
"description": "A sortable identifier for the specific snapshot of the resource\n(e.g., 2026-02-13, 5.3, A5692).",
"minLength": 1,
"pattern": "^\\S+$",
"title": "Version",
"type": "string"
}
},
"required": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,16 +75,37 @@
"title": "Property",
"type": "string"
},
"provider": {
"description": "The provider label for the entity that contributed this data\n(e.g., osm, meta, esri).",
"minLength": 1,
"pattern": "^[a-z0-9]+(_[a-z0-9]+)*$",
"title": "Provider",
"type": "string"
},
"record_id": {
"description": "Identifies the specific record within the source dataset where the source data can\nbe found.\n\nThe format of record identifiers is dataset-specific.",
"title": "Record Id",
"type": "string"
},
"resource": {
"description": "The subject or type of data contributed by the provider\n(e.g., planet, buildings, division_names).",
"minLength": 1,
"pattern": "^[a-z0-9]+(_[a-z0-9]+)*$",
"title": "Resource",
"type": "string"
},
"update_time": {
"description": "Last update time of the source data record.",
"format": "date-time",
"title": "Update Time",
"type": "string"
},
"version": {
"description": "A sortable identifier for the specific snapshot of the resource\n(e.g., 2026-02-13, 5.3, A5692).",
"minLength": 1,
"pattern": "^\\S+$",
"title": "Version",
"type": "string"
}
},
"required": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -384,16 +384,37 @@
"title": "Property",
"type": "string"
},
"provider": {
"description": "The provider label for the entity that contributed this data\n(e.g., osm, meta, esri).",
"minLength": 1,
"pattern": "^[a-z0-9]+(_[a-z0-9]+)*$",
"title": "Provider",
"type": "string"
},
"record_id": {
"description": "Identifies the specific record within the source dataset where the source data can\nbe found.\n\nThe format of record identifiers is dataset-specific.",
"title": "Record Id",
"type": "string"
},
"resource": {
"description": "The subject or type of data contributed by the provider\n(e.g., planet, buildings, division_names).",
"minLength": 1,
"pattern": "^[a-z0-9]+(_[a-z0-9]+)*$",
"title": "Resource",
"type": "string"
},
"update_time": {
"description": "Last update time of the source data record.",
"format": "date-time",
"title": "Update Time",
"type": "string"
},
"version": {
"description": "A sortable identifier for the specific snapshot of the resource\n(e.g., 2026-02-13, 5.3, A5692).",
"minLength": 1,
"pattern": "^\\S+$",
"title": "Version",
"type": "string"
}
},
"required": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -257,16 +257,37 @@
"title": "Property",
"type": "string"
},
"provider": {
"description": "The provider label for the entity that contributed this data\n(e.g., osm, meta, esri).",
"minLength": 1,
"pattern": "^[a-z0-9]+(_[a-z0-9]+)*$",
"title": "Provider",
"type": "string"
},
"record_id": {
"description": "Identifies the specific record within the source dataset where the source data can\nbe found.\n\nThe format of record identifiers is dataset-specific.",
"title": "Record Id",
"type": "string"
},
"resource": {
"description": "The subject or type of data contributed by the provider\n(e.g., planet, buildings, division_names).",
"minLength": 1,
"pattern": "^[a-z0-9]+(_[a-z0-9]+)*$",
"title": "Resource",
"type": "string"
},
"update_time": {
"description": "Last update time of the source data record.",
"format": "date-time",
"title": "Update Time",
"type": "string"
},
"version": {
"description": "A sortable identifier for the specific snapshot of the resource\n(e.g., 2026-02-13, 5.3, A5692).",
"minLength": 1,
"pattern": "^\\S+$",
"title": "Version",
"type": "string"
}
},
"required": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,16 +92,37 @@
"title": "Property",
"type": "string"
},
"provider": {
"description": "The provider label for the entity that contributed this data\n(e.g., osm, meta, esri).",
"minLength": 1,
"pattern": "^[a-z0-9]+(_[a-z0-9]+)*$",
"title": "Provider",
"type": "string"
},
"record_id": {
"description": "Identifies the specific record within the source dataset where the source data can\nbe found.\n\nThe format of record identifiers is dataset-specific.",
"title": "Record Id",
"type": "string"
},
"resource": {
"description": "The subject or type of data contributed by the provider\n(e.g., planet, buildings, division_names).",
"minLength": 1,
"pattern": "^[a-z0-9]+(_[a-z0-9]+)*$",
"title": "Resource",
"type": "string"
},
"update_time": {
"description": "Last update time of the source data record.",
"format": "date-time",
"title": "Update Time",
"type": "string"
},
"version": {
"description": "A sortable identifier for the specific snapshot of the resource\n(e.g., 2026-02-13, 5.3, A5692).",
"minLength": 1,
"pattern": "^\\S+$",
"title": "Version",
"type": "string"
}
},
"required": [
Expand Down
Loading
Loading