Skip to content

Commit 38c06a3

Browse files
authored
Merge pull request #395 from navikt/v3-setup
Clean up v3 branch
2 parents ea7e8ab + 3a57497 commit 38c06a3

File tree

191 files changed

+110
-49385
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

191 files changed

+110
-49385
lines changed

.dockerignore

-4
This file was deleted.

.env

-2
This file was deleted.

v3/.eslintrc.cjs .eslintrc.cjs

File renamed without changes.

.gitattributes

-8
This file was deleted.

.github/workflows/main-v3.yaml

+12-7
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Build, push, and deploy
33
on: [push]
44

55
concurrency:
6-
group: v3-${{ github.ref }}
6+
group: ${{ github.ref }}
77

88
jobs:
99
deploy:
@@ -12,30 +12,35 @@ jobs:
1212
permissions:
1313
contents: 'read'
1414
id-token: 'write'
15-
if: github.ref == 'refs/heads/v3'
1615
steps:
1716
- uses: actions/checkout@v4
17+
1818
- name: Install bun
1919
uses: oven-sh/setup-bun@v1
20+
2021
- name: Install dependencies (bun)
21-
working-directory: './v3/packages/internarbeidsflate-decorator-v3'
22+
working-directory: './packages/internarbeidsflate-decorator-v3'
2223
run: bun install
24+
2325
- name: Run tests
24-
working-directory: './v3/packages/internarbeidsflate-decorator-v3'
26+
working-directory: './packages/internarbeidsflate-decorator-v3'
2527
run: bun run test
28+
2629
- name: Build application
27-
working-directory: './v3/packages/internarbeidsflate-decorator-v3'
30+
working-directory: './packages/internarbeidsflate-decorator-v3'
2831
run: bun run build
32+
2933
- name: Upload to CDN dev path
30-
if: github.ref == 'refs/heads/v3' || github.ref == 'refs/heads/dev'
34+
if: github.ref == 'refs/heads/dev'
3135
uses: nais/deploy/actions/cdn-upload/v2@master
3236
with:
3337
team: personoversikt
34-
source: ./v3/packages/internarbeidsflate-decorator-v3/dist/
38+
source: ./packages/internarbeidsflate-decorator-v3/dist/
3539
destination: /internarbeidsflate-decorator-v3/dev/latest
3640
no_cache_paths: "internarbeidsflate-decorator-v3/dev/latest/dist/asset-manifest.json,internarbeidsflate-decorator-v3/dev/latest/dist/bundle.js,internarbeidsflate-decorator-v3/dev/latest/dist/index.css"
3741
identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
3842
project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
43+
3944
- name: Upload to CDN prod path
4045
if: github.ref == 'refs/heads/main'
4146
uses: nais/deploy/actions/cdn-upload/v2@master

.github/workflows/main.yaml

-107
This file was deleted.

v3/.gitignore .gitignore

File renamed without changes.

.nais/prod.yaml

-37
This file was deleted.

.nais/qa-template.yaml

-40
This file was deleted.

.prettierrc.json

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
{
2-
"trailingComma": "none",
3-
"tabWidth": 4,
4-
"semi": true,
5-
"singleQuote": true,
6-
"printWidth": 100,
7-
"arrowParens": "always"
8-
}
2+
"tabWidth": 2,
3+
"singleQuote": true
4+
}

Dockerfile

-17
This file was deleted.

LICENSE

-21
This file was deleted.

0 commit comments

Comments
 (0)