Skip to content

Commit

Permalink
Merge branch 'fix/ci' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
arthaud-proust committed Oct 19, 2023
2 parents f7b58eb + 104aa5c commit 2a837e4
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/build-on-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Build on main

on:
push:
branches: ["main"]
branches: ["main", "fix/ci"]

jobs:
build:
Expand All @@ -18,6 +18,7 @@ jobs:
git config user.email [email protected]
git config push.default current
git checkout -b release/main
php artisan typescript:transform
npm run build
git add --force public/build
git commit -m "build"
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"scripts": {
"types": "./vendor/bin/sail artisan typescript:transform",
"dev": "npm run types && vite",
"build": "npm run types && vue-tsc && vite build",
"build": "vue-tsc && vite build",
"setup": "./setup.sh",
"sail": "./vendor/bin/sail up -d"
},
Expand Down
4 changes: 2 additions & 2 deletions resources/js/Components/TextInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ defineProps<{
}>();
const emit = defineEmits<{
'update:modelValue': string
'update:modelValue': [value: string]
}>();
const input = ref<HTMLInputElement | null>(null);
Expand All @@ -17,7 +17,7 @@ onMounted(() => {
}
});
function handleInput(e: InputEvent) {
function handleInput(e: Event) {
emit('update:modelValue', (e.target as HTMLInputElement).value)
}
Expand Down
4 changes: 2 additions & 2 deletions resources/js/Components/TextareaInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ defineProps<{
}>();
const emit = defineEmits<{
'update:modelValue': string
'update:modelValue': [value: string]
}>();
const input = ref<HTMLTextAreaElement | null>(null);
Expand All @@ -17,7 +17,7 @@ onMounted(() => {
}
});
function handleInput(e: InputEvent) {
function handleInput(e: Event) {
emit('update:modelValue', (e.target as HTMLTextAreaElement).value)
}
Expand Down

0 comments on commit 2a837e4

Please sign in to comment.