Skip to content

Commit

Permalink
Merge branch 'develop-homepage' into develop. Close #147.
Browse files Browse the repository at this point in the history
**Description**

The cabal files indicate http://nasa.gov as the homepage for all
packages. However, we don't really have an Ogma homepage on NASA gov, so
it makes no sense to point to that website.

It should instead be replaced with a pointer to this repository.

**Type**

- Bug: Cabal packages point to website that does not contain information
  on Ogma.

**Additional context**

None.

**Requester**

- Ivan Perez

**Method to check presence of bug**

The following docker file checks that no cabal package uses
http://nasa.gov as homepage, in which case it prints the message
"Success":

```
FROM ubuntu:focal

RUN apt-get update

RUN apt-get install --yes git

SHELL ["/bin/bash", "-c"]
CMD git clone $REPO \
    && cd $NAME \
    && git checkout $COMMIT \
    && ! grep -niHre '^homepage\s*:\s*http\(s\)\?:\/\/nasa.gov$' --include='*.cabal' ogma** \
    && echo "Success"
```

Command (substitute variables based on new path after merge):

```sh
$ docker run -e "REPO=https://github.com/NASA/ogma" -e "NAME=ogma" -e PAT="ogma-" -e "COMMIT=<HASH>" -it ogma-verify-147
```

**Expected result**

Running the above grep command prints nothing, indicating that no cabal
page lists `http://nasa.gov` as the homepage.

**Solution implemented**

Set the homepage to Ogma's repo's URL in all cabal packages.

**Further notes**

None.
  • Loading branch information
ivanperez-keera committed Sep 22, 2024
2 parents c4d7386 + bf1de24 commit bb3a3c8
Show file tree
Hide file tree
Showing 18 changed files with 39 additions and 9 deletions.
1 change: 1 addition & 0 deletions ogma-cli/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## [1.4.X] - 2024-09-21

* Constrain version of dependency in CI jobs (#151).
* Replace homepage (#147).

## [1.4.0] - 2024-05-21

Expand Down
2 changes: 1 addition & 1 deletion ogma-cli/ogma-cli.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ build-type: Simple

name: ogma-cli
version: 1.4.0
homepage: http://nasa.gov
homepage: https://github.com/nasa/ogma
license: OtherLicense
license-file: LICENSE.pdf
author: Ivan Perez, Alwyn Goodloe
Expand Down
1 change: 1 addition & 0 deletions ogma-core/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## [1.4.X] - 2024-09-21

* Remove dependency on IfElse (#150).
* Replace homepage (#147).

## [1.4.0] - 2024-05-21

Expand Down
2 changes: 1 addition & 1 deletion ogma-core/ogma-core.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ build-type: Simple

name: ogma-core
version: 1.4.0
homepage: http://nasa.gov
homepage: https://github.com/nasa/ogma
license: OtherLicense
license-file: LICENSE.pdf
author: Ivan Perez, Alwyn Goodloe
Expand Down
4 changes: 4 additions & 0 deletions ogma-extra/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Revision history for ogma-extra

## [1.4.X] - 2024-09-21

* Replace homepage (#147).

## [1.4.0] - 2024-05-21

* Version bump 1.4.0 (#145).
Expand Down
2 changes: 1 addition & 1 deletion ogma-extra/ogma-extra.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ build-type: Simple

name: ogma-extra
version: 1.4.0
homepage: http://nasa.gov
homepage: https://github.com/nasa/ogma
license: OtherLicense
license-file: LICENSE.pdf
author: Ivan Perez, Alwyn Goodloe
Expand Down
4 changes: 4 additions & 0 deletions ogma-language-c/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Revision history for ogma-language-c

## [1.4.X] - 2024-09-21

* Replace homepage (#147).

## [1.4.0] - 2024-05-21

* Version bump 1.4.0 (#145).
Expand Down
2 changes: 1 addition & 1 deletion ogma-language-c/ogma-language-c.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ build-type: Custom

name: ogma-language-c
version: 1.4.0
homepage: http://nasa.gov
homepage: https://github.com/nasa/ogma
license: OtherLicense
license-file: LICENSE.pdf
author: Ivan Perez, Alwyn Goodloe
Expand Down
4 changes: 4 additions & 0 deletions ogma-language-cocospec/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Revision history for ogma-language-cocospec

## [1.4.X] - 2024-09-21

* Replace homepage (#147).

## [1.4.0] - 2024-05-21

* Version bump 1.4.0 (#145).
Expand Down
2 changes: 1 addition & 1 deletion ogma-language-cocospec/ogma-language-cocospec.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ build-type: Custom

name: ogma-language-cocospec
version: 1.4.0
homepage: http://nasa.gov
homepage: https://github.com/nasa/ogma
license: OtherLicense
license-file: LICENSE.pdf
author: Ivan Perez, Alwyn Goodloe
Expand Down
4 changes: 4 additions & 0 deletions ogma-language-copilot/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Revision history for ogma-language-copilot

## [1.4.X] - 2024-09-21

* Replace homepage (#147).

## [1.4.0] - 2024-05-21

* Version bump 1.4.0 (#145).
Expand Down
2 changes: 1 addition & 1 deletion ogma-language-copilot/ogma-language-copilot.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ build-type: Simple

name: ogma-language-copilot
version: 1.4.0
homepage: http://nasa.gov
homepage: https://github.com/nasa/ogma
license: OtherLicense
license-file: LICENSE.pdf
author: Ivan Perez, Alwyn Goodloe
Expand Down
4 changes: 4 additions & 0 deletions ogma-language-jsonspec/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Revision history for ogma-language-jsonspec

## [1.4.X] - 2024-09-21

* Replace homepage (#147).

## [1.4.0] - 2024-05-21

* Version bump 1.4.0 (#145).
Expand Down
2 changes: 1 addition & 1 deletion ogma-language-jsonspec/ogma-language-jsonspec.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ build-type: Simple

name: ogma-language-jsonspec
version: 1.4.0
homepage: http://nasa.gov
homepage: https://github.com/nasa/ogma
license: OtherLicense
license-file: LICENSE.pdf
author: Ivan Perez, Alwyn Goodloe
Expand Down
4 changes: 4 additions & 0 deletions ogma-language-smv/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Revision history for ogma-language-smv

## [1.4.X] - 2024-09-21

* Replace homepage (#147).

## [1.4.0] - 2024-05-21

* Version bump 1.4.0 (#145).
Expand Down
2 changes: 1 addition & 1 deletion ogma-language-smv/ogma-language-smv.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ build-type: Custom

name: ogma-language-smv
version: 1.4.0
homepage: http://nasa.gov
homepage: https://github.com/nasa/ogma
license: OtherLicense
license-file: LICENSE.pdf
author: Ivan Perez, Alwyn Goodloe
Expand Down
4 changes: 4 additions & 0 deletions ogma-spec/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Revision history for ogma-spec

## [1.4.X] - 2024-09-21

* Replace homepage (#147).

## [1.4.0] - 2024-05-21

* Version bump 1.4.0 (#145).
Expand Down
2 changes: 1 addition & 1 deletion ogma-spec/ogma-spec.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ build-type: Simple

name: ogma-spec
version: 1.4.0
homepage: http://nasa.gov
homepage: https://github.com/nasa/ogma
license: OtherLicense
license-file: LICENSE.pdf
author: Ivan Perez, Alwyn Goodloe
Expand Down

0 comments on commit bb3a3c8

Please sign in to comment.