neoris/core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into dev

Browse Source
This commit is contained in:
Ingo Oppermann 2024-04-02 14:20:03 +02:00
commit 755b03581e
No known key found for this signature in database
GPG Key ID: 2AB32426E9DD229E
2 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.github/workflows/build_base_dev.yaml vendored
View File

@ -50,14 +50,6 @@ jobs:
id: buildx id: buildx
uses: docker/setup-buildx-action@master uses: docker/setup-buildx-action@master
- name: Cache Docker layers
uses: actions/cache@v4
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ github.sha }}
restore-keys: |
${{ runner.os }}-buildx-
- name: Login to DockerHub - name: Login to DockerHub
if: github.event_name != 'pull_request' if: github.event_name != 'pull_request'
uses: docker/login-action@v3 uses: docker/login-action@v3
@ -78,8 +70,7 @@ jobs:
push: true push: true
tags: ${{ steps.meta.outputs.tags }} tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }} labels: ${{ steps.meta.outputs.labels }}
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache-new
bundle: bundle:
needs: docker needs: docker
uses: ./.github/workflows/build_bundle_dev.yaml uses: ./.github/workflows/build_bundle_dev.yaml

14
.github/workflows/build_base_vod.yaml vendored
View File

@ -16,13 +16,13 @@ jobs:
- os: alpine - os: alpine
os_version: "3.19" os_version: "3.19"
golang: golang:1.22-alpine3.19 golang: golang:1.22-alpine3.19
platforms: linux/amd64,linux/arm64 platforms: linux/amd64,linux/arm64,linux/arm/v7
branch: vod branch: vod
key: alpine3.19 key: alpine3.19
- os: alpine - os: alpine
os_version: "3.16" os_version: "3.16"
golang: golang:1.19-alpine3.16 golang: golang:1.19-alpine3.16
platforms: linux/amd64,linux/arm64 platforms: linux/amd64,linux/arm64,linux/arm/v7
branch: vod branch: vod
key: alpine3.16 key: alpine3.16
@ -50,14 +50,6 @@ jobs:
id: buildx id: buildx
uses: docker/setup-buildx-action@master uses: docker/setup-buildx-action@master
- name: Cache Docker layers
uses: actions/cache@v4
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ github.sha }}
restore-keys: |
${{ runner.os }}-buildx-
- name: Login to DockerHub - name: Login to DockerHub
if: github.event_name != 'pull_request' if: github.event_name != 'pull_request'
uses: docker/login-action@v3 uses: docker/login-action@v3
@ -78,5 +70,3 @@ jobs:
push: true push: true
tags: ${{ steps.meta.outputs.tags }} tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }} labels: ${{ steps.meta.outputs.labels }}
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache-new