Remove Unnecessary Docker Test Pipeline (#93)
* Remove: container test pipeline * Update: build pipelines rely on test pipeline * Fix: typo in build file * Fix: naming conventions for workflows in yml
This commit is contained in:
19
.github/workflows/build.yml
vendored
19
.github/workflows/build.yml
vendored
@@ -1,21 +1,10 @@
|
|||||||
name: Builds
|
name: Builds
|
||||||
run-name: Validate Node and Docker Builds
|
run-name: Validate Node and Docker Builds
|
||||||
on:
|
on:
|
||||||
pull_request:
|
workflow_run:
|
||||||
branches:
|
workflows: [Tests]
|
||||||
- master
|
types:
|
||||||
paths:
|
- completed
|
||||||
- '*'
|
|
||||||
- 'package*.json'
|
|
||||||
- 'src/**'
|
|
||||||
- 'tests/**'
|
|
||||||
- '!docs/**'
|
|
||||||
- '!imgs/**'
|
|
||||||
- '!.github/**'
|
|
||||||
- '.github/workflows/**'
|
|
||||||
- '!.gitignore'
|
|
||||||
- '!LICENSE'
|
|
||||||
- '!README'
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
Discord-Node-Build: # test if the node install and run
|
Discord-Node-Build: # test if the node install and run
|
||||||
|
|||||||
31
.github/workflows/test.yml
vendored
31
.github/workflows/test.yml
vendored
@@ -48,34 +48,3 @@ jobs:
|
|||||||
- name: Test Application
|
- name: Test Application
|
||||||
run: |
|
run: |
|
||||||
npm run test:run
|
npm run test:run
|
||||||
|
|
||||||
Discord-Ollama-Container-Test:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
timeout-minutes: 2
|
|
||||||
steps:
|
|
||||||
- name: Checkout Repository
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Set up Node Environment lts/hydrogen
|
|
||||||
uses: actions/setup-node@v4
|
|
||||||
with:
|
|
||||||
node-version: lts/hydrogen
|
|
||||||
cache: "npm"
|
|
||||||
|
|
||||||
- name: Create Environment Variables
|
|
||||||
run: |
|
|
||||||
touch .env
|
|
||||||
echo CLIENT_TOKEN = ${{ secrets.BOT_TOKEN }} >> .env
|
|
||||||
echo GUILD_ID = ${{ secrets.GUILD_ID }} >> .env
|
|
||||||
echo MODEL = ${{ secrets.MODEL }} >> .env
|
|
||||||
echo CLIENT_UID = ${{ secrets.CLIENT_UID }} >> .env
|
|
||||||
echo OLLAMA_IP = ${{ secrets.OLLAMA_IP }} >> .env
|
|
||||||
echo OLLAMA_PORT = ${{ secrets.OLLAMA_PORT }} >> .env
|
|
||||||
|
|
||||||
- name: Setup Docker Network and Images
|
|
||||||
run: |
|
|
||||||
npm run docker:start-cpu
|
|
||||||
|
|
||||||
- name: Test Docker Container
|
|
||||||
run: |
|
|
||||||
npm run docker:test
|
|
||||||
@@ -19,7 +19,6 @@
|
|||||||
"docker:clean": "docker rm -f discord && docker rm -f ollama && docker rmi $(docker images --filter \"dangling=true\" -q --no-trunc)",
|
"docker:clean": "docker rm -f discord && docker rm -f ollama && docker rmi $(docker images --filter \"dangling=true\" -q --no-trunc)",
|
||||||
"docker:network": "docker network create --subnet=172.18.0.0/16 ollama-net",
|
"docker:network": "docker network create --subnet=172.18.0.0/16 ollama-net",
|
||||||
"docker:build": "docker build --no-cache -t discord/bot:$(node -p \"require('./package.json').version\") .",
|
"docker:build": "docker build --no-cache -t discord/bot:$(node -p \"require('./package.json').version\") .",
|
||||||
"docker:test": "docker run -d --rm -v discord:/src/app --name test discord/bot:$(node -p \"require('./package.json').version\") npm run test:run",
|
|
||||||
"docker:client": "docker run -d -v discord:/src/app --name discord --network ollama-net --ip 172.18.0.3 discord/bot:$(node -p \"require('./package.json').version\")",
|
"docker:client": "docker run -d -v discord:/src/app --name discord --network ollama-net --ip 172.18.0.3 discord/bot:$(node -p \"require('./package.json').version\")",
|
||||||
"docker:ollama": "docker run -d --gpus=all -v ollama:/root/.ollama -p 11434:11434 --name ollama --network ollama-net --ip 172.18.0.2 ollama/ollama:latest",
|
"docker:ollama": "docker run -d --gpus=all -v ollama:/root/.ollama -p 11434:11434 --name ollama --network ollama-net --ip 172.18.0.2 ollama/ollama:latest",
|
||||||
"docker:ollama-cpu": "docker run -d -v ollama:/root/.ollama -p 11434:11434 --name ollama --network ollama-net --ip 172.18.0.2 ollama/ollama:latest"
|
"docker:ollama-cpu": "docker run -d -v ollama:/root/.ollama -p 11434:11434 --name ollama --network ollama-net --ip 172.18.0.2 ollama/ollama:latest"
|
||||||
|
|||||||
Reference in New Issue
Block a user