Skip to content

Commit

Permalink
Merge pull request #20 from ChouquetteCorp/develop
Browse files Browse the repository at this point in the history 
Release 1.2.0
  • Loading branch information
@BilelJegham
BilelJegham authored Jun 13, 2024
2 parents 04bf6bd + 4f990a1 commit 15d0c85
Show file tree
Hide file tree
Showing 10 changed files with 650 additions and 34 deletions.
18 changes: 9 additions & 9 deletions .github/configApiSport/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,41 +11,41 @@
"rugby": [
{
"league": 52,
"season": 2022
"season": 2024
},
{
"league": 54,
"season": 2022
"season": 2024
},
{
"league": 16,
"season": 2022
"season": 2024
},
{
"league": 69,
"season": 2023
"season": 2024
}
],
"handball": [
{
"league": 132,
"season": 2023
"season": 2024
},
{
"league": 32,
"season": 2023
"season": 2024
},
{
"league": 35,
"season": 2023
"season": 2024
},
{
"league": 29,
"season": 2023
"season": 2024
},
{
"league": 34,
"season": 2023
"season": 2024
}
]
}
Expand Down
34 changes: 27 additions & 7 deletions .github/configApiSport/football.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,31 +13,51 @@
"football": [
{
"league": 66,
"season": 2023
"season": 2024
},
{
"league": 64,
"season": 2023
"season": 2024
},
{
"league": 61,
"season": 2023
"season": 2024
},
{
"league": 2,
"season": 2023
"season": 2024
},
{
"league": 525,
"season": 2023
"season": 2024
},
{
"league": 3,
"season": 2023
"season": 2024
},
{
"league": 8,
"season": 2023
"season": 2024
},
{
"league": 4,
"season": 2024
},
{
"league": 10,
"season": 2024
},
{
"league": 6110,
"season": 2024
},
{
"league": 6111,
"season": 2024
},
{
"league": 5932,
"season": 2024
}
]
}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cd_production.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ jobs:
PROJECT_ID: ${{ secrets.PRODUCTION_PROJECT_ID }}

steps:
- uses: actions/checkout@v3
- uses: actions/cache@v3
- uses: actions/checkout@v4
- uses: actions/cache@v4
id: cache
with:
path: ~/.npm
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cd_staging.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ jobs:
STAGING_PROJECT_ID: ${{ secrets.STAGING_PROJECT_ID }}

steps:
- uses: actions/checkout@v3
- uses: actions/cache@v3
- uses: actions/checkout@v4
- uses: actions/cache@v4
id: cache
with:
path: ~/.npm
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ jobs:
integration:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/cache@v3
- uses: actions/checkout@v4
- uses: actions/cache@v4
id: cache
with:
path: ~/.npm
Expand All @@ -29,16 +29,16 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install dependencies
uses: cypress-io/github-action@v5
uses: cypress-io/github-action@v6
with:
# just perform install
runTests: false
- name: Start server in the background
run: npm run supabase:start -- -x studio,imgproxy,inbucket,pgadmin-schema-diff,migra,postgres-meta,vector,pgbouncer,logflare
- name: Cypress run
uses: cypress-io/github-action@v5
uses: cypress-io/github-action@v6
with:
install: false
start: npm run dev:emulator
Expand Down
14 changes: 8 additions & 6 deletions .github/workflows/getmatchs.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Get Matches
run: |
npx --yes api-sport-cli get-matchs -c .github/configApiSport/football.json -s matchs.football.sql -j matchs.football.json -u api_id
npx --yes api-sport-cli get-matchs -c .github/configApiSport/default.json -s matchs.sql -j matchs.json -u api_id
env:
SPORT_API_KEY: ${{ secrets.SPORT_API_KEY }}
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: matchs
path: |
Expand All @@ -33,16 +33,18 @@ jobs:
sudo apt-get install -y postgresql-15
- name: Add matchs.sql to database Staging
run: |
psql -h "db.$STAGING_PROJECT_ID.supabase.co" -p 5432 -d postgres -U postgres -f matchs.football.sql
psql -h "db.$STAGING_PROJECT_ID.supabase.co" -p 5432 -d postgres -U postgres -f matchs.sql
psql -h "$HOST" -p 5432 -d postgres -U "postgres.$STAGING_PROJECT_ID" -f matchs.football.sql
psql -h "$HOST" -p 5432 -d postgres -U "postgres.$STAGING_PROJECT_ID" -f matchs.sql
env:
PGPASSWORD: ${{ secrets.STAGING_DB_PASSWORD }}
HOST: ${{ secrets.STAGING_HOST }}
STAGING_PROJECT_ID: ${{ secrets.STAGING_PROJECT_ID }}

- name: Add matchs.sql to database Prod
run: |
psql -h "db.$PRODUCTION_PROJECT_ID.supabase.co" -p 5432 -d postgres -U postgres -f matchs.football.sql
psql -h "db.$PRODUCTION_PROJECT_ID.supabase.co" -p 5432 -d postgres -U postgres -f matchs.sql
psql -h "$HOST" -p 5432 -d postgres -U "postgres.$PRODUCTION_PROJECT_ID" -f matchs.football.sql
psql -h "$HOST" -p 5432 -d postgres -U "postgres.$PRODUCTION_PROJECT_ID" -f matchs.sql
env:
PGPASSWORD: ${{ secrets.PRODUCTION_DB_PASSWORD }}
HOST: ${{ secrets.PRODUCTION_HOST }}
PRODUCTION_PROJECT_ID: ${{ secrets.PRODUCTION_PROJECT_ID }}
4 changes: 2 additions & 2 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "beerbet",
"version": "1.1.0",
"version": "1.2.0",
"scripts": {
"dev": "vite --port 3000",
"dev:emulator": "vite --port 3000 --mode=emulator",
Expand Down
Loading

0 comments on commit 15d0c85

Please sign in to comment.