diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 00000000..48fbab38 --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,27 @@ +name: Deploy + +on: + push: + branches: [main] + pull_request: + branches: + - main + +jobs: + ci: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + + - name: Test + run: | + npm install + npm run test + + - name: Deploy + if: github.ref == 'refs/heads/main' + env: + DEPLOY_URL: ${{ secrets.RENDER_DEPLOY_HOOK_URL }} + run: | + curl "$DEPLOY_URL" + \ No newline at end of file diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 00000000..a4ff575a --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,44 @@ +# Name of workflow +name: Lint and Test workflow + +# Trigger workflow on all pull requests +on: + pull_request: + branches: + - develop + - staging + - main + +# Jobs to carry out +jobs: + test: + # Operating system to run job on + runs-on: ubuntu-latest + + # Steps in job + steps: + # Get code from repo + - name: Checkout code + uses: actions/checkout@v1 + + - name: Use Node.js 21.x + uses: actions/setup-node@v1 + with: + node-version: 21.x + + # Install dependencies + - name: 🧰 Install Deps + run: npm install + + # Run lint + - name: Run Lint + run: npm run lint + + # Run build + - name: Run Build + run: npm run build + + # Run tests + - name: Run Tests + run: npm run test + \ No newline at end of file diff --git a/src/components/Advertisement.tsx b/src/components/Advertisement.tsx index 2181f6aa..bb55bcb2 100644 --- a/src/components/Advertisement.tsx +++ b/src/components/Advertisement.tsx @@ -2,7 +2,7 @@ interface AdvertisementProps { companyName: string; productDescription: string; price: string; -}; +} function Advertisement(props: AdvertisementProps) { return ( diff --git a/src/components/Calculator.tsx b/src/components/Calculator.tsx index bfac7800..9040d335 100644 --- a/src/components/Calculator.tsx +++ b/src/components/Calculator.tsx @@ -15,6 +15,7 @@ export default function Calculator() { return (
+

Simple Calculator