Skip to content

Commit

Permalink
Merge pull request #1160 from research-software-directory/fix-typos
Browse files Browse the repository at this point in the history
Fix typos
  • Loading branch information
ewan-escience authored Apr 9, 2024
2 parents a268adb + 63361c7 commit cc4d348
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/codemeta_scan_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ jobs:
runs-on: ubuntu-22.04
strategy:
matrix:
go-version: [ '1.22.1' ]
go-version: [ '1.22.2' ]
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- name: "Build application with Go"
uses: actions/setup-go@v5
with:
go-version: '1.22.1'
go-version: '1.22.2'
- run: |
go build -v
working-directory: codemeta
Expand Down
2 changes: 1 addition & 1 deletion codemeta/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# SPDX-License-Identifier: Apache-2.0

FROM golang:1.22.1-bookworm AS builder
FROM golang:1.22.2-bookworm AS builder

WORKDIR /usr/src/app
COPY go.mod .
Expand Down
2 changes: 1 addition & 1 deletion codemeta/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ If your instance of the RSD is hosted on https://example.com/, you can access th

## Developing

This module is written in Go, version 1.22.1. You can find the installation instruction [here](https://go.dev/doc/install). If this page lists a newer version than the one we use, you can find all versions [here](https://go.dev/dl/). We currently don't have any external dependencies, except [Pico CSS](https://picocss.com/), which is dynamically linked in the HTML.
This module is written in Go, version 1.22.2. You can find the installation instruction [here](https://go.dev/doc/install). If this page lists a newer version than the one we use, you can find all versions [here](https://go.dev/dl/). We currently don't have any external dependencies, except [Pico CSS](https://picocss.com/), which is dynamically linked in the HTML.

When developing and running it locally, you need a locally running RSD instance, and you should set the `POSTGREST_URL` environment variable to a value at which the PostgREST backend can be reached. This will probably be `http://localhost/api/v1`. You can also point it to a dev or production server instead.

Expand Down
2 changes: 1 addition & 1 deletion codemeta/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@

module codemeta

go 1.22.1
go 1.22.2
4 changes: 2 additions & 2 deletions codemeta/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ type SoftwareApplication struct {
Description []string `json:"description"`
CodeRepository *string `json:"codeRepository"`
Author []Person `json:"author"`
Keyword []string `json:"keyword"`
Keywords []string `json:"keywords"`
ProgrammingLanguage []string `json:"programmingLanguage"`
License []CreativeWork `json:"license"`
ReferencePublication []ScholarlyArticle `json:"referencePublication"`
Expand Down Expand Up @@ -236,7 +236,7 @@ func convertRsdToCodeMeta(bytes []byte) ([]byte, error) {
Name: rsdResponse.BrandName,
Description: extractDescription(rsdResponse),
Author: extractContributors(rsdResponse),
Keyword: extractKeywords(rsdResponse),
Keywords: extractKeywords(rsdResponse),
ProgrammingLanguage: extractProgrammingLanguages(rsdResponse),
License: extractLicenses(rsdResponse),
ReferencePublication: extractReferencePublications(rsdResponse),
Expand Down
4 changes: 3 additions & 1 deletion frontend/components/projects/edit/organisations/config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
// SPDX-FileCopyrightText: 2022 Dusan Mijatovic (dv4all)
// SPDX-FileCopyrightText: 2022 dv4all
// SPDX-FileCopyrightText: 2024 Ewan Cahen (Netherlands eScience Center) <[email protected]>
// SPDX-FileCopyrightText: 2024 Netherlands eScience Center
//
// SPDX-License-Identifier: Apache-2.0

Expand All @@ -9,7 +11,7 @@ export const cfgOrganisations = {
title: 'Add organisation',
subtitle: 'We search by name in the RSD and the ROR databases',
label: 'Find or add organisation',
help: 'At least the fist 2 letters of the organisation name',
help: 'At least the first 2 letters of the organisation name',
validation: {
// custom validation rule, not in use by react-hook-form
minLength: 2,
Expand Down
2 changes: 1 addition & 1 deletion frontend/components/software/edit/editSoftwareConfig.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ export const organisationInformation = {
title: 'Add organisation',
subtitle: 'We search by name in the RSD and the ROR databases',
label: 'Find or add organisation',
help: 'At least the fist 2 letters of the organisation name',
help: 'At least the first 2 letters of the organisation name',
validation: {
// custom validation rule, not in use by react-hook-form
minLength: 2,
Expand Down

0 comments on commit cc4d348

Please sign in to comment.