Merge remote-tracking branch 'origin/main'
This commit is contained in:
6
.github/workflows/deploy-docker.yml
vendored
6
.github/workflows/deploy-docker.yml
vendored
@@ -1,7 +1,11 @@
|
||||
name: Docker Image CI
|
||||
|
||||
on:
|
||||
workflow_call:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
tags:
|
||||
- "docker-build-*"
|
||||
|
||||
jobs:
|
||||
build-and-push:
|
||||
|
||||
15
.github/workflows/increase-version.yml
vendored
15
.github/workflows/increase-version.yml
vendored
@@ -30,6 +30,15 @@ jobs:
|
||||
|
||||
# Push changes to remote main branch
|
||||
git push origin main
|
||||
|
||||
build-and-run:
|
||||
uses: ./.github/workflows/deploy-docker.yml@main
|
||||
|
||||
trigger-pipeline-b:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v3
|
||||
- name: Create and push tag
|
||||
run: |
|
||||
git config --global user.name "Gitea Actions"
|
||||
git config --global user.email "actions@gitea.local"
|
||||
git tag docker-build-$(date +%s)
|
||||
git push --tags
|
||||
4
package-lock.json
generated
4
package-lock.json
generated
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "pay-point",
|
||||
"version": "0.0.15",
|
||||
"version": "0.0.21",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "pay-point",
|
||||
"version": "0.0.15",
|
||||
"version": "0.0.21",
|
||||
"dependencies": {
|
||||
"@angular/animations": "^19.0.0",
|
||||
"@angular/cdk": "^19.0.0",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "pay-point",
|
||||
"version": "0.0.15",
|
||||
"version": "0.0.21",
|
||||
"scripts": {
|
||||
"ng": "ng",
|
||||
"start": "ng serve",
|
||||
|
||||
Reference in New Issue
Block a user