Skip to content

Commit

Permalink
Merge pull request #9 from mbeps/tweaks
Browse files Browse the repository at this point in the history
Tweaks
  • Loading branch information
mbeps authored Jun 11, 2023
2 parents b7de9c7 + 35540c4 commit 934dd0e
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 3 deletions.
36 changes: 35 additions & 1 deletion .github/workflows/merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- main

jobs:
lint_and_build:
lint:
runs-on: ubuntu-latest
steps:
- name: Checkout
Expand Down Expand Up @@ -42,5 +42,39 @@ jobs:
- name: Run Linter
run: ${{ steps.detect-package-manager.outputs.runner }} eslint '**/*.{js,ts,tsx}'

build:
needs: lint
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Detect package manager
id: detect-package-manager
run: |
if [ -f "${{ github.workspace }}/yarn.lock" ]; then
echo "manager=yarn" >> $GITHUB_OUTPUT
echo "command=install" >> $GITHUB_OUTPUT
echo "runner=yarn" >> $GITHUB_OUTPUT
exit 0
elif [ -f "${{ github.workspace }}/package.json" ]; then
echo "manager=npm" >> $GITHUB_OUTPUT
echo "command=ci" >> $GITHUB_OUTPUT
echo "runner=npx --no-install" >> $GITHUB_OUTPUT
exit 0
else
echo "Unable to determine package manager"
exit 1
fi
- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: "16"
cache: ${{ steps.detect-package-manager.outputs.manager }}

- name: Install dependencies
run: ${{ steps.detect-package-manager.outputs.manager }} ${{ steps.detect-package-manager.outputs.command }}

- name: Build
run: ${{ steps.detect-package-manager.outputs.runner }} next build
2 changes: 1 addition & 1 deletion components/Content/AboutSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const languages = [
*/
const technologies = [
{ technology: "Git" },
{ technology: "SVM" },
{ technology: "SVN" },
{ technology: "Firebase" },
{ technology: "Supabase" },
{ technology: "GitHub Actions" },
Expand Down
2 changes: 1 addition & 1 deletion components/Content/ProjectSection/ProjectItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const ProjectItem: React.FC<Project> = ({

return (
<SlideUp offset="-300px 0px -300px 0px">
<div className="bg-neutral-100 dark:bg-stone-950 p-4 rounded-xl sm:bg-transparent sm:dark:bg-transparent sm:p-0">
<div className="bg-neutral-100 dark:bg-stone-950 p-4 rounded-xl sm:bg-transparent sm:dark:bg-transparent sm:p-0 transition-colors duration-500 ease-in-out">
<div className="flex flex-col animate-slideUpCubiBezier animation-delay-2 md:flex-row md:space-x-12">
{imageURL && (
<div className="md:w-1/2">
Expand Down

1 comment on commit 934dd0e

@vercel
Copy link

@vercel vercel bot commented on 934dd0e Jun 11, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.