Skip to content

Commit 053cf48

Browse files
committed
Fixes to file structuring and changes to nextjs.yml
1 parent 0eeef65 commit 053cf48

File tree

72 files changed

+48
-85
lines changed

Some content is hidden

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

72 files changed

+48
-85
lines changed

.github/workflows/nextjs.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ jobs:
3434
- name: Detect package manager
3535
id: detect-package-manager
3636
run: |
37-
if [ -f "${{ github.workspace }}/okstateacm.github.io/yarn.lock" ]; then
37+
if [ -f "${{ github.workspace }}/yarn.lock" ]; then
3838
echo "manager=yarn" >> $GITHUB_OUTPUT
3939
echo "command=install" >> $GITHUB_OUTPUT
4040
echo "runner=yarn" >> $GITHUB_OUTPUT
4141
exit 0
42-
elif [ -f "${{ github.workspace }}/okstateacm.github.io/package.json" ]; then
42+
elif [ -f "${{ github.workspace }}/package.json" ]; then
4343
echo "manager=npm" >> $GITHUB_OUTPUT
4444
echo "command=ci" >> $GITHUB_OUTPUT
4545
echo "runner=npx --no-install" >> $GITHUB_OUTPUT
@@ -67,10 +67,10 @@ jobs:
6767
path: |
6868
.next/cache
6969
# Generate a new cache whenever packages or source files change.
70-
key: ${{ runner.os }}-nextjs-${{ hashFiles('**/okstateacm.github.io/package-lock.json', '**/okstateacm.github.io/yarn.lock') }}-${{ hashFiles('**.[jt]s', '**.[jt]sx') }}
70+
key: ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json', '**/yarn.lock') }}-${{ hashFiles('**.[jt]s', '**.[jt]sx') }}
7171
# If source files changed but packages didn't, rebuild from a prior cache.
7272
restore-keys: |
73-
${{ runner.os }}-nextjs-${{ hashFiles('**/okstateacm.github.io/package-lock.json', '**/okstateacm.github.io/yarn.lock') }}-
73+
${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json', '**/yarn.lock') }}-
7474
- name: Install dependencies
7575
run: ${{ steps.detect-package-manager.outputs.manager }} ${{ steps.detect-package-manager.outputs.command }}
7676
- name: Build with Next.js

.gitignore

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,47 @@ yarn-debug.log*
1616
# Ignore testing coverage reports
1717
/coverage/
1818
# Ignore MacOS system files
19-
.DS_Store
19+
.DS_Stores
20+
21+
22+
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
23+
24+
# dependencies
25+
/node_modules
26+
/.pnp
27+
.pnp.*
28+
.yarn/*
29+
!.yarn/patches
30+
!.yarn/plugins
31+
!.yarn/releases
32+
!.yarn/versions
33+
34+
# testing
35+
/coverage
36+
37+
# next.js
38+
/.next/
39+
/out/
40+
41+
# production
42+
/build
43+
44+
# misc
45+
.DS_Store
46+
*.pem
47+
48+
# debug
49+
npm-debug.log*
50+
yarn-debug.log*
51+
yarn-error.log*
52+
.pnpm-debug.log*
53+
54+
# env files (can opt-in for committing if needed)
55+
.env*
56+
57+
# vercel
58+
.vercel
59+
60+
# typescript
61+
*.tsbuildinfo
62+
next-env.d.ts
File renamed without changes.
File renamed without changes.
File renamed without changes.

okstateacm.github.io/.gitignore

Lines changed: 0 additions & 41 deletions
This file was deleted.

okstateacm.github.io/README.md

Lines changed: 0 additions & 39 deletions
This file was deleted.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)