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

Push develop to Release #416

Merged
merged 19 commits into from
Jan 4, 2025
Merged
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
24 changes: 23 additions & 1 deletion .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -208,12 +208,34 @@
"contributions": [
"code"
]
},
{
"login": "lFourl",
"name": "Darius West",
"avatar_url": "https://avatars.githubusercontent.com/u/39689166?v=4",
"profile": "http://dwest.dev",
"contributions": [
"code",
"content"
]
},
{
"login": "evertiro",
"name": "Evertiro",
"avatar_url": "https://avatars.githubusercontent.com/u/36433?v=4",
"profile": "https://evertiro.com",
"contributions": [
"code",
"content"
]
}
],
"repoType": "github",
"repoHost": "https://github.com",
"skipCi": true,
"files": [
"README.md"
]
],
"commitType": "docs",
"commitConvention": "angular"
}
64 changes: 16 additions & 48 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Deploy

on:
workflow_dispatch:
push:
branches: [ develop, release ]

Expand All @@ -12,40 +13,23 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v2

- name: Read `.nvmrc`
run: echo "::set-output name=nvmrc::$(cat .nvmrc)"
id: nvm
uses: actions/checkout@v4

- name: Use Node.js (.nvmrc)
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: "${{ steps.nvm.outputs.nvmrc }}"

- name: Read `yarn cache dir`
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
node-version-file: '.nvmrc'
cache: 'yarn'

- name: Load yarn cache
uses: actions/cache@v2
id: yarn-cache
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-
- name: Install dependencies
run: yarn install --immutable

- name: Load Next.js cache
uses: actions/cache@v2
- name: Load Next Cache
uses: actions/cache@v4
with:
path: ${{ github.workspace }}/dist/cache
key: ${{ runner.os }}-nextjs-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-nextjs-

- name: Install dependencies
run: yarn install --immutable
key: ${{ runner.os }}-nextjs-${{ hashFiles('**/yarn.lock') }}-${{ hashFiles('**/*.js', '**/*.jsx', '**/*.ts', '**/*.tsx') }}
restore-keys: ${{ runner.os }}-nextjs-${{ hashFiles('**/yarn.lock') }}-

- name: Build
run: yarn build
Expand All @@ -71,7 +55,7 @@ jobs:
yarn.lock

- name: Publish artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: fuelrats-com
path: fuelrats-com.tar.gz
Expand All @@ -86,7 +70,7 @@ jobs:

steps:
- name: Download artifact
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
with:
name: fuelrats-com

Expand All @@ -95,27 +79,11 @@ jobs:
tar -xzf fuelrats-com.tar.gz
rm fuelrats-com.tar.gz

- name: Read `.nvmrc`
run: echo "::set-output name=nvmrc::$(cat .nvmrc)"
id: nvm

- name: Use Node.js (.nvmrc)
uses: actions/setup-node@v1
with:
node-version: "${{ steps.nvm.outputs.nvmrc }}"

- name: Read `yarn cache dir`
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn config get cacheFolder)"

- name: Load yarn cache
uses: actions/cache@v2
id: yarn-cache
uses: actions/setup-node@v4
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-
node-version-file: '.nvmrc'
cache: 'yarn'

- name: Install dependencies
run: yarn install --immutable
Expand Down
60 changes: 14 additions & 46 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,78 +11,46 @@ jobs:
name: Lint
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Read `.nvmrc`
run: echo "::set-output name=nvmrc::$(cat .nvmrc)"
id: nvm
uses: actions/checkout@v4

- name: Use Node.js (.nvmrc)
uses: actions/setup-node@v1
with:
node-version: "${{ steps.nvm.outputs.nvmrc }}"

- name: Read `yarn cache dir`
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn config get cacheFolder)"

- name: Load yarn cache
uses: actions/cache@v2
id: yarn-cache
uses: actions/setup-node@v4
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-
node-version-file: '.nvmrc'
cache: 'yarn'

- name: Install dependencies
run: yarn install --immutable

- name: Lint
uses: wearerequired/lint-action@v1.9.0
uses: wearerequired/lint-action@v2.3.0
with:
github_token: ${{ secrets.github_token }}
eslint: true
eslint_args: "--max-warnings 0"
stylelint: true
stylelint_args: "--max-warnings 0"
stylelint_extensions: "css,sass,scss"

build:
runs-on: ubuntu-latest
name: Build Test
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Read `.nvmrc`
run: echo "::set-output name=nvmrc::$(cat .nvmrc)"
id: nvm
uses: actions/checkout@v4

- name: Use Node.js (.nvmrc)
uses: actions/setup-node@v1
with:
node-version: "${{ steps.nvm.outputs.nvmrc }}"

- name: Read `yarn cache dir`
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn config get cacheFolder)"

- name: Load yarn cache
uses: actions/cache@v2
id: yarn-cache
uses: actions/setup-node@v4
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-
node-version-file: '.nvmrc'
cache: 'yarn'

- name: Load Next.js cache
uses: actions/cache@v2
- name: Load Next Cache
uses: actions/cache@v4
with:
path: ${{ github.workspace }}/dist/cache
key: ${{ runner.os }}-nextjs-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-nextjs-
key: ${{ runner.os }}-nextjs-${{ hashFiles('**/yarn.lock') }}-${{ hashFiles('**/*.js', '**/*.jsx', '**/*.ts', '**/*.tsx') }}
restore-keys: ${{ runner.os }}-nextjs-${{ hashFiles('**/yarn.lock') }}-

- name: Install dependencies
run: yarn install --immutable
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ For detailed rules of this file, see [Changelog Rules](#changelog-rules)

### ✨ Added

*
* An option for users to update their registered email address through the user profile.

### ⚡ Changed

Expand Down
Loading
Loading