Skip to content

Commit be98d9a

Browse files
authored
KEH-921-3 - Update branch and repo names (#60)
* Replace all mentions of 'master' with 'main' * Replace mentions of 'dashboard' with 'lambda' - Remove deleted terraform from .gitignore
1 parent 6ebf7f4 commit be98d9a

File tree

9 files changed

+18
-23
lines changed

9 files changed

+18
-23
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ name: CI
33

44
on: # yamllint disable-line rule:truthy
55
push:
6-
branches: [master]
6+
branches: [main]
77
pull_request:
8-
branches: [master]
8+
branches: [main]
99

1010
concurrency:
1111
group: "${{ github.head_ref || github.ref }}-${{ github.workflow }}"

.github/workflows/deploy_mkdocs.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
# A GitHub Actions workflow to deploy MkDocs documentation to GitHub Pages on push to the master or main branch.
1+
# A GitHub Actions workflow to deploy MkDocs documentation to GitHub Pages on push to the main branch.
22
---
33
name: Deploy MkDocs
44
on:
55
push:
66
branches:
7-
- master
87
- main
98
permissions:
109
contents: write

.gitignore

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,6 @@ override.tf.json
5353
.terraformrc
5454
terraform.rc
5555

56-
# Ignore the terraform/service prority calc
57-
terraform/dashboard/highest_priority.txt
58-
terraform/dashboard/highest_alb_listener_priority.txt
59-
6056
.env
6157

6258
# Ignore the .DS_Store file created by macOS

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ This project uses Pytest for testing. The tests can be found in the `tests` fold
6767

6868
To run all tests, use `make test`.
6969

70-
On pull request or push to the `master` branch, the tests will automatically run. The workflow will fail if any tests fail, or if test coverage is below 95%.
70+
On pull request or push to the `main` branch, the tests will automatically run. The workflow will fail if any tests fail, or if test coverage is below 95%.
7171

7272
The related workflow can be found in `.github/workflows/ci.yml`.
7373

@@ -91,7 +91,7 @@ lint ## Run Python linters without fixing.
9191
lint-apply ## Run black and ruff with auto-fix, and Pylint.
9292
```
9393

94-
On pull request or push to the `master` branch, `make lint` will automatically run to check code quality, failing if there are any issues. It is up to the developer to apply fixes.
94+
On pull request or push to the `main` branch, `make lint` will automatically run to check code quality, failing if there are any issues. It is up to the developer to apply fixes.
9595

9696
The related workflow can be found in `.github/workflows/ci.yml`.
9797

@@ -400,7 +400,7 @@ If you wish to set a pipeline for another branch without checking out, you can r
400400
./concourse/scripts/set_pipeline.sh github-copilot-usage-lambda <branch_name>
401401
```
402402

403-
If the branch you are deploying is `main` or `master`, it will trigger a deployment to the `sdp-prod` environment. To set the ECR image tag, you must draft a GitHub release pointing to the latest release of the `main/master` branch that has a tag in the form of `vX.Y.Z.` Drafting up a release will automatically deploy the latest version of the `main/master` branch with the associated release tag, but you can also manually trigger a build through the Concourse UI or the terminal prompt.
403+
If the branch you are deploying is `main`, it will trigger a deployment to the `sdp-prod` environment. To set the ECR image tag, you must draft a GitHub release pointing to the latest release of the `main` branch that has a tag in the form of `vX.Y.Z.` Drafting up a release will automatically deploy the latest version of the `main` branch with the associated release tag, but you can also manually trigger a build through the Concourse UI or the terminal prompt.
404404

405405
## Triggering a pipeline
406406
Once the pipeline has been set, you can manually trigger a build on the Concourse UI, or run the following command:

catalog-info.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
apiVersion: backstage.io/v1alpha1
22
kind: Component
33
metadata:
4-
name: github-copilot-usage-dashboard
4+
name: github-copilot-usage-lambda
55
annotations:
6-
github.com/project-slug: ONS-Innovation/github-copilot-usage-dashboard
6+
github.com/project-slug: ONS-Innovation/github-copilot-usage-lambda
77
links:
8-
- url: https://ons-innovation.github.io/github-copilot-usage-dashboard
9-
title: Copilot Usage Dashboard Documentation
8+
- url: https://ons-innovation.github.io/github-copilot-usage-lambda
9+
title: Copilot Usage Lambda Documentation
1010
spec:
1111
type: service
1212
lifecycle: production

concourse/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ resources:
33
type: git
44
icon: github
55
source:
6-
uri: https://github.com/ONS-Innovation/github-copilot-usage-dashboard
6+
uri: https://github.com/ONS-Innovation/github-copilot-usage-lambda
77
username: ((github_access_token))
88
password: x-oauth-basic
99
branch: ((branch))
@@ -38,7 +38,7 @@ jobs:
3838
apk add --no-cache aws-cli podman jq iptables curl
3939
4040
if [[ "((env))" == "prod" ]]; then
41-
tag=$(curl "https://api.github.com/repos/ONS-Innovation/github-copilot-usage-dashboard/releases" | jq -r '.[0].tag_name')
41+
tag=$(curl "https://api.github.com/repos/ONS-Innovation/github-copilot-usage-lambda/releases" | jq -r '.[0].tag_name')
4242
export tag
4343
else
4444
export tag=((tag))
@@ -69,7 +69,7 @@ jobs:
6969
apk add --no-cache jq curl
7070
7171
if [[ "((env))" == "prod" ]]; then
72-
tag=$(curl "https://api.github.com/repos/ONS-Innovation/github-copilot-usage-dashboard/releases" | jq -r '.[0].tag_name')
72+
tag=$(curl "https://api.github.com/repos/ONS-Innovation/github-copilot-usage-lambda/releases" | jq -r '.[0].tag_name')
7373
export tag
7474
else
7575
export tag=((tag))

concourse/scripts/set_pipeline.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ else
1111
branch=$(git rev-parse --abbrev-ref HEAD)
1212
fi
1313

14-
if [[ ${branch} == "main" || ${branch} == "master" ]]; then
14+
if [[ ${branch} == "main" ]]; then
1515
env="prod"
1616
else
1717
env="dev"

docs/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ This section gathers data from AWS S3. The Copilot usage endpoints have a limita
3535

3636
## Getting Started
3737

38-
To setup and use the project, please refer to the [README](https://github.com/ONS-Innovation/github-copilot-usage-dashboard/blob/master/README.md).
38+
To setup and use the project, please refer to the [README](https://github.com/ONS-Innovation/github-copilot-usage-lambda/blob/main/README.md).

mkdocs.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
site_name: GitHub Copilot Usage Dashboard
1+
site_name: GitHub Copilot Usage Lambda
22

3-
repo_url: https://github.com/ONS-Innovation/github-copilot-usage-dashboard
4-
repo_name: GitHub Copilot Usage Dashboard
3+
repo_url: https://github.com/ONS-Innovation/github-copilot-usage-lambda
4+
repo_name: GitHub Copilot Usage Lambda
55

66
nav:
77
- Home: 'index.md'

0 commit comments

Comments
 (0)