Compare commits
10 Commits
133-read-r
...
v2.1.5
| Author | SHA1 | Date | |
|---|---|---|---|
| 0806e114e1 | |||
| fc716c664b | |||
| 5a1e24a1ce | |||
| b93327f840 | |||
| bbcf6cb3de | |||
| 344d4f5625 | |||
| 22fbf7615b | |||
| 5a84c221d6 | |||
| 13f1e86e72 | |||
| 92fec88ad1 |
@@ -15,7 +15,7 @@ jobs:
|
|||||||
environment: ${{ inputs.environment_name }}
|
environment: ${{ inputs.environment_name }}
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: https://gitea.com/actions/checkout@v6
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
sparse-checkout: |
|
sparse-checkout: |
|
||||||
api
|
api
|
||||||
@@ -45,8 +45,8 @@ jobs:
|
|||||||
- name: Build Client
|
- name: Build Client
|
||||||
env:
|
env:
|
||||||
VITE_API_URL: ${{ vars.VITE_API_URL }}
|
VITE_API_URL: ${{ vars.VITE_API_URL }}
|
||||||
VITE_BASE_URL: ${{ case(inputs.environment_name === 'test', vars.VITE_BASE_URL_TEST, vars.VITE_BASE_URL_PROD) }}
|
VITE_BASE_URL: ${{ inputs.environment_name == 'test' && vars.VITE_BASE_URL_TEST || vars.VITE_BASE_URL_PROD }}
|
||||||
VITE_CLIENT_ID: ${{ case(inputs.environment_name === 'test', vars.VITE_CLIENT_ID_TEST, vars.VITE_CLIENT_ID_PROD) }}
|
VITE_CLIENT_ID: ${{ inputs.environment_name == 'test' && vars.VITE_CLIENT_ID_TEST || vars.VITE_CLIENT_ID_PROD }}
|
||||||
VITE_ISSUER_URI: ${{ vars.VITE_ISSUER_URI }}
|
VITE_ISSUER_URI: ${{ vars.VITE_ISSUER_URI }}
|
||||||
VITE_TENANT_ID: ${{ vars.VITE_TENANT_ID }}
|
VITE_TENANT_ID: ${{ vars.VITE_TENANT_ID }}
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
@@ -15,19 +15,20 @@ on:
|
|||||||
permissions:
|
permissions:
|
||||||
id-token: write
|
id-token: write
|
||||||
contents: read
|
contents: read
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
deploy:
|
deploy:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
environment: ${{ inputs.environment_name }}
|
environment: ${{ inputs.environment_name }}
|
||||||
steps:
|
steps:
|
||||||
- name: Log in to Azure
|
- name: Install Azure CLI
|
||||||
uses: azure/login@v3
|
run: |
|
||||||
with:
|
curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
|
||||||
creds: '{"clientId":"${{ vars.AZURE_CLIENT_ID }}","clientSecret":"${{ secrets.AZURE_CLIENT_SECRET }}","subscriptionId":"${{ secrets.AZURE_SUBSCRIPTION_ID }}","tenantId":"${{ vars.AZURE_TENANT_ID }}"}'
|
|
||||||
|
|
||||||
- name: Azure CLI script
|
- name: Log in to Azure
|
||||||
uses: azure/cli@v2
|
run: |
|
||||||
with:
|
az login --service-principal --username ${{ vars.AZURE_CLIENT_ID }} --password ${{ secrets.AZURE_CLIENT_SECRET }} --tenant ${{ vars.AZURE_TENANT_ID }}
|
||||||
azcliversion: latest
|
|
||||||
inlineScript: |
|
- name: Update Container App
|
||||||
az containerapp update --name ${{ inputs.app_name }}-${{ inputs.environment_name }} --container-name ${{ inputs.app_name }} --resource-group noahspan --image docker.io/noahspan/${{ inputs.app_name }}:${{ inputs.version_number }}
|
run: |
|
||||||
|
az containerapp update --name ${{ inputs.app_name }}-${{ inputs.environment_name }} --container-name ${{ inputs.app_name }} --resource-group ${{ vars.RESOURCE_GROUP }} --image docker.io/noahspan/${{ inputs.app_name }}:${{ inputs.version_number }}
|
||||||
@@ -8,9 +8,9 @@ jobs:
|
|||||||
changes:
|
changes:
|
||||||
uses: ./.gitea/workflows/changes.yaml
|
uses: ./.gitea/workflows/changes.yaml
|
||||||
|
|
||||||
build:
|
build-and-test:
|
||||||
if: ${{ needs.changes.outputs.api == 'true' || needs.changes.outputs.client == 'true' }}
|
if: ${{ needs.changes.outputs.api == 'true' || needs.changes.outputs.client == 'true' }}
|
||||||
name: build
|
name: build-and-test
|
||||||
needs:
|
needs:
|
||||||
- changes
|
- changes
|
||||||
uses: ./.gitea/workflows/build_and_test.yaml
|
uses: ./.gitea/workflows/build_and_test.yaml
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
# Flying API
|
# Flying API
|
||||||
|
|
||||||
An API for the Flying app.
|
An API for the Flying app.
|
||||||
|
...
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "api",
|
"name": "api",
|
||||||
"version": "2.1.4",
|
"version": "2.1.5",
|
||||||
"description": "",
|
"description": "",
|
||||||
"author": "",
|
"author": "",
|
||||||
"private": true,
|
"private": true,
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
...
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "client",
|
"name": "client",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "2.1.4",
|
"version": "2.1.5",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ export default defineConfig({
|
|||||||
strictPort: true
|
strictPort: true
|
||||||
},
|
},
|
||||||
server: {
|
server: {
|
||||||
|
host: true,
|
||||||
port: 8080,
|
port: 8080,
|
||||||
proxy: {
|
proxy: {
|
||||||
'/api': {
|
'/api': {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@noahspan/flying",
|
"name": "@noahspan/flying",
|
||||||
"version": "2.1.4",
|
"version": "2.1.5",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"start": "node api/dist/main",
|
"start": "node api/dist/main",
|
||||||
"format": "prettier --write \"**/src/**/*.ts\" \"**/test/**/*.ts\"",
|
"format": "prettier --write \"**/src/**/*.ts\" \"**/test/**/*.ts\"",
|
||||||
|
|||||||
Reference in New Issue
Block a user