Skip to content

Commit

Permalink
Merge pull request #643 from trheyi/main
Browse files Browse the repository at this point in the history
refactor: Update Docker image versions and artifact upload actions
  • Loading branch information
trheyi authored Jul 4, 2024
2 parents f802bdb + f2a9598 commit eb1f9a4
Show file tree
Hide file tree
Showing 11 changed files with 73 additions and 833 deletions.
9 changes: 4 additions & 5 deletions .github/workflows/build-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,11 @@ jobs:
container:
# DockerFile
# https://github.com/YaoApp/yao/blob/main/docker/build/Dockerfile
image: yaoapp/yao-build:0.10.4
image: yaoapp/yao-build:0.10.4

steps:

- name: Install Coscmd
run: |
run: |
apt-get install -y python3-venv
python3 -m venv /python3/venv
/python3/venv/bin/python -m pip install coscmd
Expand All @@ -40,12 +39,12 @@ jobs:
ls -l /data
- name: Archive production artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: yao-linux
path: |
/data/*
- name: Push To Silicon Valley
run: |
for file in /data/*; do /python3/venv/bin/coscmd upload $file /archives/; done;
for file in /data/*; do /python3/venv/bin/coscmd upload $file /archives/; done;
32 changes: 3 additions & 29 deletions .github/workflows/build-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ jobs:
uses: actions/checkout@v3
with:
repository: yaoapp/gou
# ref: dc3d98411f61e21cf775e4c82d92d5ac2acfc03c
path: gou

- name: Checkout V8Go
Expand All @@ -61,10 +60,11 @@ jobs:
path: v8go

- name: Checkout XGen v1.0
# ** XGEN will be renamed to DUI in the feature. and move to the new repository. **
# ** new repository: https://github.com/YaoApp/dui.git **
uses: actions/checkout@v3
with:
repository: yaoapp/xgen
# ref: 408470b84c9d6bb8ed988b545b6e46ffc2872014
path: xgen-v1.0

- name: Checkout Yao-Init
Expand Down Expand Up @@ -131,34 +131,8 @@ jobs:
clean: false

- name: Archive production artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: yao-macos
path: |
dist/release/*
# - name: Configure COS For Beijing
# env:
# SECRET_ID: ${{ secrets.COS_ID }}
# SECRET_KEY: ${{ secrets.COS_KEY }}
# BUCKET: release-bj-1252011659
# REGION: ap-beijing
# run: |
# coscmd config -a $SECRET_ID -s $SECRET_KEY -b $BUCKET -r $REGION

# - name: Push To Beijing
# run: |
# for file in ./dist/release/*; do coscmd upload $file /archives/; done;

# - name: Configure COS For Silicon Valley
# env:
# SECRET_ID: ${{ secrets.COS_ID }}
# SECRET_KEY: ${{ secrets.COS_KEY }}
# BUCKET: release-sv-1252011659
# REGION: na-siliconvalley
# run: |
# coscmd config -a $SECRET_ID -s $SECRET_KEY -b $BUCKET -r $REGION

# - name: Push To Silicon Valley
# run: |
# for file in ./dist/release/*; do coscmd upload $file /archives/; done;
29 changes: 19 additions & 10 deletions .github/workflows/pr-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,9 @@ env:
# Application Setting

## Path
YAO_TEST_APPLICATION: ${{ github.WORKSPACE }}/../app
YAO_EXTENSION_ROOT: ${{ github.WORKSPACE }}/../extension
YAO_TEST_APPLICATION: ${{ github.WORKSPACE }}/../app
YAO_SUI_TEST_APPLICATION: ${{ github.WORKSPACE }}/../yao-yao-startup-webapp
YAO_TEST_BUILDER_APPLICATION: ${{ github.WORKSPACE }}/../page-builder-app

## Runtime
Expand Down Expand Up @@ -122,7 +123,7 @@ jobs:
});
- name: Setup Cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/.cache/go-build
Expand All @@ -132,45 +133,52 @@ jobs:
${{ runner.os }}-go-
- name: Checkout Kun
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: yaoapp/kun
path: kun

- name: Checkout Xun
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: yaoapp/xun
path: xun

- name: Checkout Gou
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: yaoapp/gou
path: gou

- name: Checkout V8Go
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: yaoapp/v8go
lfs: true
path: v8go

- name: Checkout Demo App
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: yaoapp/yao-dev-app
path: app

- name: Checkout Yao Startup Webapp
uses: actions/checkout@v4
with:
repository: yaoapp/yao-startup-webapp
token: ${{ secrets.YAO_TEST_TOKEN }}
path: yao-startup-webapp

- name: Checkout Page Builder App
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: yaoapp/page-builder-app
token: ${{ secrets.YAO_TEST_TOKEN }}
path: page-builder-app

- name: Checkout Extension
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: yaoapp/yao-extensions-dev
path: extension
Expand All @@ -184,11 +192,12 @@ jobs:
mv app ../
mv extension ../
mv page-builder-app ../
mv yao-startup-webapp ../
ls -l .
ls -l ../
- name: Checkout pull request HEAD commit
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ env.HEAD }}

Expand Down
86 changes: 0 additions & 86 deletions .github/workflows/release-v0.10.3-pre-docker.yml

This file was deleted.

Loading

0 comments on commit eb1f9a4

Please sign in to comment.