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

chore: Merge upstream #29

Closed
wants to merge 42 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
8db3c42
feat: Add Kodiak configuration
l0b0 Nov 22, 2021
ccef9b4
Merge pull request #4 from linz/feat/add-kodiak-configuration
l0b0 Nov 22, 2021
a13a166
chore: Fix whitespace (#6)
l0b0 Nov 22, 2021
b87045b
chore: Ignore IDEA configuration (#3)
l0b0 Nov 22, 2021
87f0719
refactor: Use conditional instead of `oneOf` (#7)
l0b0 Nov 25, 2021
7c6e44e
feat: Add Dependabot configuration (#2)
l0b0 Nov 29, 2021
9d9a00b
Merge branch 'stac-extensions:main' into main
l0b0 Nov 29, 2021
5ae3b47
feat: Add Nix shell (#5)
l0b0 Nov 30, 2021
5fa0f3b
feat: Add editor configuration (#1)
l0b0 Feb 9, 2022
006c69e
chore(deps): Bump actions/setup-node from 1 to 3.5.0 (#27)
dependabot[bot] Oct 1, 2022
dd81e85
chore(deps): Bump actions/setup-node from 3.5.0 to 3.6.0 (#30)
dependabot[bot] Jan 9, 2023
432721e
chore(deps): Bump remark-cli from 8.0.1 to 11.0.0 (#24)
dependabot[bot] Mar 20, 2023
abb1215
chore(deps): Bump remark-validate-links from 10.0.4 to 12.1.0 (#26)
dependabot[bot] Mar 20, 2023
44a50af
chore(deps): Bump actions/checkout from 2 to 3.1.0 (#28)
dependabot[bot] Mar 20, 2023
755542a
chore(deps): Bump remark-preset-lint-markdown-style-guide from 3.0.1 …
dependabot[bot] Mar 21, 2023
d4090e2
chore(deps): Bump remark-preset-lint-consistent from 3.0.1 to 5.1.1 (…
dependabot[bot] Mar 21, 2023
2eb4f55
chore(deps): Bump remark-preset-lint-recommended from 4.0.1 to 6.1.2 …
dependabot[bot] Mar 21, 2023
d09b47a
fix: Don't build on push to PRs
l0b0 Mar 21, 2023
d9ac1d6
feat: Enable building on request
l0b0 Mar 21, 2023
81c7eb6
fix: Use unique job names
l0b0 Mar 21, 2023
251364e
refactor: Split commands into separate steps
l0b0 Mar 21, 2023
7513f69
feat: Add "finalise" job
l0b0 Mar 21, 2023
1c67de9
fix: Indentation according to `remark`
l0b0 Mar 21, 2023
f0ff3b4
Merge pull request #34 from linz/fix/avoid-duplicate-runs
l0b0 Jun 8, 2023
edd81e5
chore(deps): Bump actions/setup-node from 3.6.0 to 3.7.0 (#37)
dependabot[bot] Jul 17, 2023
c138be5
chore(deps): Bump remark-lint-no-html from 2.0.1 to 3.1.2 (#36)
dependabot[bot] Jul 17, 2023
0e7cd46
Merge remote-tracking branch 'upstream/main' into chore/sync-repo
l0b0 Jul 17, 2023
559bb9c
fix: Indent according to `remark` suggestions
l0b0 Jul 17, 2023
dba17db
Merge branch 'main' into chore/sync-repo
l0b0 Jul 17, 2023
89a065d
Merge pull request #31 from linz/chore/sync-repo
l0b0 Jul 17, 2023
d545bcb
chore(deps): Bump remark-lint from 7.0.1 to 9.1.2 (#35)
dependabot[bot] Jul 17, 2023
f755d2f
chore(deps): Bump actions/checkout from 3 to 4
dependabot[bot] Sep 4, 2023
0fdcd21
chore(deps): Bump remark-validate-links from 12.1.1 to 13.0.0
dependabot[bot] Sep 25, 2023
f92370f
Merge pull request #40 from linz/dependabot/github_actions/actions/ch…
l0b0 Jun 11, 2024
2f11845
Merge branch 'main' into dependabot/npm_and_yarn/remark-validate-link…
l0b0 Jun 11, 2024
9551c38
chore(deps): Bump peaceiris/actions-gh-pages from 3 to 4
dependabot[bot] Jun 11, 2024
9392c11
Merge pull request #43 from linz/dependabot/npm_and_yarn/remark-valid…
l0b0 Jun 11, 2024
aaf597c
chore(deps): Bump remark-lint from 9.1.2 to 10.0.0
dependabot[bot] Jun 11, 2024
a9b36f9
Merge pull request #48 from linz/dependabot/npm_and_yarn/remark-lint-…
l0b0 Jun 11, 2024
e947ed3
Merge branch 'main' into dependabot/github_actions/peaceiris/actions-…
l0b0 Jun 11, 2024
41d1839
Merge pull request #47 from linz/dependabot/github_actions/peaceiris/…
l0b0 Jun 11, 2024
7818bb4
Merge remote-tracking branch 'upstream/main' into merge-upstream
l0b0 Jun 11, 2024
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
8 changes: 8 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# EditorConfig is awesome: https://EditorConfig.org

[*]
charset = utf-8
end_of_line = lf
indent_size = 2
indent_style = space
insert_final_newline = true
10 changes: 10 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
version: 2
updates:
- package-ecosystem: github-actions
directory: /
schedule:
interval: daily
- package-ecosystem: npm
directory: /
schedule:
interval: daily
2 changes: 1 addition & 1 deletion .github/remark.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ plugins:
- - remark-lint-no-shortcut-reference-link
- false
# Lists
- remark-gfm
- remark-lint-list-item-bullet-indent
- remark-lint-ordered-list-marker-style
- remark-lint-ordered-list-marker-value
- remark-lint-checkbox-character-style
- - remark-lint-unordered-list-marker-style
- '-'
- - remark-lint-list-item-indent
- space
# Tables
- remark-lint-table-pipes
- remark-lint-no-literal-urls
2 changes: 1 addition & 1 deletion .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
uses: rlespinasse/[email protected]
- uses: actions/checkout@v4
- name: deploy JSON Schema for version ${{ env.GITHUB_REF_SLUG }}
uses: peaceiris/actions-gh-pages@v3.9.3
uses: peaceiris/actions-gh-pages@v4
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: json-schema
Expand Down
29 changes: 21 additions & 8 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,26 @@
name: Check Markdown and Examples
on: [push, pull_request]
on:
pull_request:
push:
branches:
- master
workflow_dispatch:
jobs:
deploy:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/setup-node@v3
with:
node-version: 'lts/*'
- uses: actions/[email protected]
- uses: actions/checkout@v4
- run: |
npm install
npm test
- run: npm install
- run: npm test
finalise:
name: Verify all dependencies passed
if: always()
needs:
- test
runs-on: ubuntu-22.04
steps:
- name: Decide whether the needed jobs succeeded or failed
uses: re-actors/[email protected]
with:
jobs: ${{ toJSON(needs) }}
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,6 @@ Thumbs.db
# Node / npm
.npm
/node_modules/
package-lock.json
/.idea/
/node_modules/
/package-lock.json
10 changes: 10 additions & 0 deletions .kodiak.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
version = 1

[approve]
auto_approve_usernames = ["dependabot"]

[merge]
method = "squash"

[merge.message]
title = "pull_request_title"
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]
## [Unreleased][]

### Added

Expand Down
49 changes: 25 additions & 24 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,36 +1,37 @@
# Template Extension Specification

- **Title:** Template
- **Identifier:** <https://stac-extensions.github.io/template/v1.0.0/schema.json>
- **Field Name Prefix:** template
- **Scope:** Item, Collection
- **Extension [Maturity Classification](https://github.com/radiantearth/stac-spec/tree/master/extensions/README.md#extension-maturity):** Proposal
- **Owner**: @your-gh-handles @person2
- foo
- **Title:** Template
- **Identifier:** <https://stac-extensions.github.io/template/v1.0.0/schema.json>
- **Field Name Prefix:** template
- **Scope:** Item, Collection
- **Extension [Maturity Classification](https://github.com/radiantearth/stac-spec/tree/master/extensions/README.md#extension-maturity):** Proposal
- **Owner**: @your-gh-handles @person2

This document explains the Template Extension to the [SpatioTemporal Asset Catalog](https://github.com/radiantearth/stac-spec) (STAC) specification.
This is the place to add a short introduction.

- Examples:
- [Item example](examples/item.json): Shows the basic usage of the extension in a STAC Item
- [Collection example](examples/collection.json): Shows the basic usage of the extension in a STAC Collection
- [JSON Schema](json-schema/schema.json)
- [Changelog](./CHANGELOG.md)
- Examples:
- [Item example](examples/item.json): Shows the basic usage of the extension in a STAC Item
- [Collection example](examples/collection.json): Shows the basic usage of the extension in a STAC Collection
- [JSON Schema](json-schema/schema.json)
- [Changelog](./CHANGELOG.md)

## Fields

The fields in the table below can be used in these parts of STAC documents:

- [ ] Catalogs
- [x] Collections
- [x] Item Properties (incl. Summaries in Collections)
- [x] Assets (for both Collections and Items, incl. Item Asset Definitions in Collections)
- [ ] Links
- [ ] Catalogs
- [x] Collections
- [x] Item Properties (incl. Summaries in Collections)
- [x] Assets (for both Collections and Items, incl. Item Asset Definitions in Collections)
- [ ] Links

| Field Name | Type | Description |
| -------------------- | ------------------------- | -------------------------------------------- |
| Field Name | Type | Description |
| -------------------- | ------------------------- | ----------- |
| template:new_field | string | **REQUIRED**. Describe the required field... |
| template:xyz | [XYZ Object](#xyz-object) | Describe the field... |
| template:another_one | \[number] | Describe the field... |
| template:xyz | [XYZ Object](#xyz-object) | Describe the field... |
| template:another_one | \[number] | Describe the field... |

### Additional Field Information

Expand All @@ -42,8 +43,8 @@ This is a much more detailed description of the field `template:new_field`...

This is the introduction for the purpose and the content of the XYZ Object...

| Field Name | Type | Description |
| ---------- | ------ | -------------------------------------------- |
| Field Name | Type | Description |
| ---------- | ------ | ----------- |
| x | number | **REQUIRED**. Describe the required field... |
| y | number | **REQUIRED**. Describe the required field... |
| z | number | **REQUIRED**. Describe the required field... |
Expand All @@ -53,8 +54,8 @@ This is the introduction for the purpose and the content of the XYZ Object...
The following types should be used as applicable `rel` types in the
[Link Object](https://github.com/radiantearth/stac-spec/tree/master/item-spec/item-spec.md#link-object).

| Type | Description |
| -------------- | ------------------------------------- |
| Type | Description |
| -------------- | ----------- |
| fancy-rel-type | This link points to a fancy resource. |

## Contributing
Expand Down
Loading
Loading