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

Remove vscode settings #78

Open
wants to merge 6 commits into
base: dev
Choose a base branch
from
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
8 changes: 4 additions & 4 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ jobs:

name: Build BCDC-SMK container image
# The type of runner that the job will run on
runs-on: ubuntu-18.04
runs-on: ubuntu-latest
outputs:
dockerversiontag: ${{ steps.calculateImageTag.outputs.DOCKER_VERSION_TAG }}
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
- uses: actions/checkout@v4
id: checkout
with:
# Disabling shallow clone is recommended for improving relevancy of reporting
Expand Down Expand Up @@ -62,7 +62,7 @@ jobs:
# --------- CACHE THE IMAGE TAG and ISSUE URL IN AN ARTIFACT
- name: upload image tag
id: uploadimagetag
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: imagetag
path: |
Expand All @@ -74,7 +74,7 @@ jobs:
- name: Create the docker image
uses: docker/build-push-action@v1
with:
registry: docker.pkg.github.com
registry: ghcr.io
username: $GITHUB_ACTOR
password: ${{ secrets.GITHUB_TOKEN }}
repository: bcgov/bcdc-smk/bcdc-smk
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/devdeploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
defaults:
run:
shell: bash
runs-on: ubuntu-18.04
runs-on: ubuntu-latest
outputs:
dockerversiontag: ${{ steps.retrieveimagetag.outputs.DOCKER_VERSION_TAG }}
issue_url: ${{ steps.retrieveimagetag.outputs.ISSUE_URL }}
Expand All @@ -22,7 +22,7 @@ jobs:
steps:
# Checking out code to get access to the openshift deploy template later on
# could also reference the github url?
- uses: actions/checkout@v2
- uses: actions/checkout@v4
id: checkout
with:
fetch-depth: 0
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/prddeploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ jobs:
defaults:
run:
shell: bash
runs-on: ubuntu-18.04
runs-on: ubuntu-latest
outputs:
dockerversiontag: ${{ steps.retrieveimagetag.outputs.DOCKER_VERSION_TAG }}

steps:

# CHECKOUT THE CODE
- uses: actions/checkout@v2
- uses: actions/checkout@v4
id: checkout
with:
fetch-depth: 0
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,9 @@ dist
# TernJS port file
.tern-port

# IDE files
.vscode

openshift/junk.js
openshift/jenkins_etltools_deployconfig.yaml
openshift/jenkins_bcdctools_deployconfig.yaml
Expand Down
12 changes: 0 additions & 12 deletions .vscode/settings.json

This file was deleted.

Binary file added assets/BCSans-Regular.woff
Binary file not shown.
11 changes: 10 additions & 1 deletion assets/style.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
@font-face {
font-family: 'BC Sans';
src: url('BCSans-Regular.woff') format('woff');
}

body {
position: absolute;
top: 0;
Expand All @@ -12,7 +17,11 @@ body {
justify-content: stretch;
align-items: stretch;

font-family: Helvetica,Arial,sans-serif;
font-family: 'BC Sans',Helvetica,Arial,sans-serif;
}

button, input {
font-family: inherit;
}

header {
Expand Down
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<title></title>
<!-- SMK BOOTSTRAP - - - - - - - -->
<link rel="stylesheet" type="text/css" href="./assets/style.css"/>
<script src="./node_modules/smk/dist/smk.js"></script>
<script src="./node_modules/@bcgov/smk/dist/smk.js"></script>
<!-- - - - - - - - - - - - - - - -->
</head>

Expand Down
2 changes: 1 addition & 1 deletion openshift/deployTemplate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ parameters:
value: dev
- name: "CONTAINER_SRC"
description: "path to the container/image stream"
value: docker.pkg.github.com/bcgov/bcdc-smk/bcdc-smk
value: ghcr.io/bcgov/bcdc-smk/bcdc-smk
- name: "CONTAINER_SRC_SECRET_NAME"
description: "name of the secret that is used to retrieve the container, require by github hosted packages (images)"
value: bcdcsmk-image-secret
Expand Down
2 changes: 1 addition & 1 deletion openshift/flow.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ repository: https://github.com/bcgov/bcdc-smk
* type: Image Secret
* secret name: bcdcsmk-image-secret
* Authentication: Image Registry Credentials
* Image Registry Server Address: docker.pkg.github.com/bcgov/bcdc-smk/bcdc-smk
* Image Registry Server Address: ghcr.io/bcgov/bcdc-smk/bcdc-smk


#### Create a service account
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"author": "Kevin Netherton",
"dependencies": {
"http-server": "^0.12.3",
"smk": "1.0.0-beta.3"
"@bcgov/smk": "1.2.3"
},
"scripts": {
"browse": "http-server -o -c-1 -p 8080"
Expand Down
5 changes: 3 additions & 2 deletions smk-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,11 @@
],
"zoom": 6.676380220353304
},
"baseMap": "Streets"
"esriApiKey": "AAPTxy8BH1VEsoebNVZXo8HurGGT_aCYgwCokRuPIAG5xSNuKTy4YvprSz_8gsh-llA428WQLbub59AvL7Vqq0WxOMBde6XTOmB0jkCxW4n59DLiYkN4tPwEaTnCtos8sUlWGZQSjl3lPZ0XM61ZkYR3M3QY8du3_BH3IZhyIg63PgYU4dgbXSYQOryTwd8izSWgEXS-8CCbPsNR6jLnoFipFDDa-w1R3FHGZifjDuJ83oM.AT1_qYsJlLTy",
"baseMap": "bcgov"
},
"layers": [],
"version": "0.9.0-beta.3",
"version": "1.0.1",
"createdBy": "Kevin Netherton",
"createdDate": "2020-08-10T18:46:29.944Z",
"tools": [
Expand Down
Loading