Skip to content

Commit

Permalink
Merge branch 'master' into txt_fix
Browse files Browse the repository at this point in the history
  • Loading branch information
valeraBr committed Jan 25, 2024
2 parents 3fd9a9a + f7f089a commit e5a529e
Show file tree
Hide file tree
Showing 632 changed files with 111,986 additions and 22,130 deletions.
81 changes: 81 additions & 0 deletions .github/workflows/ui_build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
name: UI Build and Create PR

on:
push:
branches:
- master
paths:
- 'ui_src/**'

jobs:
build-and-commit:
runs-on: ubuntu-latest

steps:
- name: Checkout Repository
uses: actions/checkout@v3

- name: Fetch Latest Master
run: |
git fetch origin master
git checkout master
git reset --hard origin/master
- name: Set up Node.js
uses: actions/setup-node@v3
with:
node-version: '18'

- name: Install Dependencies
run: |
cd ui_src
npm i
- name: Print Current Working Directory Path
run: pwd

- name: Print Current Working Directory List
run: ls -la

- name: Create New Branch
run: |
git checkout -b ui-build-files-${{ github.run_id }}
- name: Clear Previous Build
run: |
ls -la ./ui_static_files/build/
rm -rf ./ui_static_files/build/*
ls -la ./ui_static_files/build/
- name: Build
run: |
cd ui_src
npm run ci-build
- name: List Root Directory Contents
run: |
ls -la ./ui_static_files/build/
- name: Commit Changes
run: |
git config --global user.name 'teammemphis'
git config --global user.email 'team@memphis.dev'
git add ./ui_static_files/build/*
git commit -m "Build UI Static Files" -a || echo "No changes to commit"
- name: Push Changes
run: |
git push origin ui-build-files-${{ github.run_id }}
- name: Create Pull Request
uses: repo-sync/pull-request@v2
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
pr_title: "Build UI Static Files"
pr_body: "Automated UI build for commit ${{ github.sha }}"
destination_branch: "master"
source_branch: "ui-build-files-${{ github.run_id }}"
pr_assignee: "idanasulinmemphis"

env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -76,5 +76,5 @@ npm-debug.log*
yarn-debug.log*
yarn-error.log*
*.icloud
package-lock.json
#package-lock.json
docker-compose-dev-env.yml
12 changes: 8 additions & 4 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
"METADATA_DB_PORT": "5005",
"USER_PASS_BASED_AUTH": "true",
"CONNECTION_TOKEN": "memphis",
"ENV": "dev"
"ENV": "dev",
"INITIAL_CONFIG_FILE": ""
}
},
{
Expand All @@ -48,7 +49,8 @@
"METADATA_DB_PORT": "5005",
"USER_PASS_BASED_AUTH": "true",
"CONNECTION_TOKEN": "memphis",
"ENV": "dev"
"ENV": "dev",
"INITIAL_CONFIG_FILE": ""
}
},
{
Expand All @@ -73,7 +75,8 @@
"METADATA_DB_PORT": "5005",
"USER_PASS_BASED_AUTH": "true",
"CONNECTION_TOKEN": "memphis",
"ENV": "dev"
"ENV": "dev",
"INITIAL_CONFIG_FILE": ""
}
},
{
Expand All @@ -98,7 +101,8 @@
"METADATA_DB_PORT": "5005",
"USER_PASS_BASED_AUTH": "true",
"CONNECTION_TOKEN": "memphis",
"ENV": "dev"
"ENV": "dev",
"INITIAL_CONFIG_FILE": ""
}
}
]
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# syntax=docker/dockerfile:1

FROM --platform=$BUILDPLATFORM golang:1.19-alpine3.17 as build
FROM --platform=$BUILDPLATFORM golang:1.20-alpine3.18 as build

WORKDIR $GOPATH/src/memphis
COPY . .

ARG TARGETOS TARGETARCH
RUN CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -ldflags="-w" -a -o .

FROM alpine:3.17
FROM alpine:3.18
ENV GOPATH="/go/src"
WORKDIR /run

Expand Down
Loading

0 comments on commit e5a529e

Please sign in to comment.