Skip to content

Commit

Permalink
Adjust CI and CD pipelines, as well as Dependabot config
Browse files Browse the repository at this point in the history
Kovah committed Jul 17, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent b76b6a9 commit 22388ad
Showing 5 changed files with 13 additions and 29 deletions.
8 changes: 4 additions & 4 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@ version: 2
updates:
- package-ecosystem: "npm"
directory: "/"
target-branch: "dev"
target-branch: "2.x"
schedule:
interval: "weekly"
groups:
@@ -16,7 +16,7 @@ updates:

- package-ecosystem: "composer"
directory: "/"
target-branch: "dev"
target-branch: "2.x"
schedule:
interval: "weekly"
groups:
@@ -30,7 +30,7 @@ updates:

- package-ecosystem: "docker"
directory: "/"
target-branch: "dev"
target-branch: "2.x"
schedule:
interval: "weekly"
groups:
@@ -40,7 +40,7 @@ updates:

- package-ecosystem: "github-actions"
directory: "/"
target-branch: "dev"
target-branch: "2.x"
schedule:
interval: "weekly"
groups:
2 changes: 1 addition & 1 deletion .github/workflows/analyze.yml
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ name: Analyze
on:
push:
branches:
- main
- 2.x

jobs:

27 changes: 4 additions & 23 deletions .github/workflows/build-docker.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
name: Build the LinkAce Docker image
name: Build the v2 LinkAce Docker image

on:
push:
tags:
- "*"
- "v2.*"

jobs:
build_regular_docker:
@@ -38,9 +38,9 @@ jobs:
run: |
DOCKER_IMAGE=linkace/linkace
DOCKER_IMAGE_GITHUB=ghcr.io/kovah/linkace
MAJOR_VERSION=1.x
MAJOR_VERSION=2.x
VERSION=${GITHUB_REF#refs/tags/}
TAGS="${DOCKER_IMAGE}:${VERSION},${DOCKER_IMAGE}:${MAJOR_VERSION},${DOCKER_IMAGE}:latest,${DOCKER_IMAGE_GITHUB}:${VERSION},${DOCKER_IMAGE_GITHUB}:${MAJOR_VERSION},${DOCKER_IMAGE_GITHUB}:latest"
TAGS="${DOCKER_IMAGE}:${VERSION},${DOCKER_IMAGE}:${MAJOR_VERSION},${DOCKER_IMAGE_GITHUB}:${VERSION},${DOCKER_IMAGE_GITHUB}:${MAJOR_VERSION}"
echo "tags=${TAGS}" >> $GITHUB_OUTPUT
- name: Build and push advanced image
@@ -51,22 +51,3 @@ jobs:
platforms: linux/amd64,linux/arm64,linux/arm/v7
push: true
tags: ${{ steps.prep.outputs.tags }}

- name: Prepare simple tags
id: prep-simple
run: |
DOCKER_IMAGE=linkace/linkace
DOCKER_IMAGE_GITHUB=ghcr.io/kovah/linkace
VERSION=${GITHUB_REF#refs/tags/}
MAJOR_VERSION=1.x
TAGS="${DOCKER_IMAGE}:${VERSION}-php-nginx,${DOCKER_IMAGE}:${MAJOR_VERSION}-php-nginx,${DOCKER_IMAGE}:php-nginx,${DOCKER_IMAGE}:${VERSION}-simple,${DOCKER_IMAGE}:${MAJOR_VERSION}-simple,${DOCKER_IMAGE}:simple,${DOCKER_IMAGE_GITHUB}:${VERSION}-php-nginx,${DOCKER_IMAGE_GITHUB}:${MAJOR_VERSION}-php-nginx,${DOCKER_IMAGE_GITHUB}:php-nginx,${DOCKER_IMAGE_GITHUB}:${VERSION}-simple,${DOCKER_IMAGE_GITHUB}:${MAJOR_VERSION}-simple,${DOCKER_IMAGE_GITHUB}:simple"
echo "tags=${TAGS}" >> $GITHUB_OUTPUT
- name: Build and push simple image
uses: docker/build-push-action@v6
with:
context: .
file: ./resources/docker/dockerfiles/release-multiplatform-simple.Dockerfile
platforms: linux/amd64,linux/arm64,linux/arm/v7
push: true
tags: ${{ steps.prep-simple.outputs.tags }}
2 changes: 1 addition & 1 deletion .github/workflows/build-package.yml
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ name: Build Release Package
on:
push:
branches:
- main
- 2.x

jobs:
build-package:
3 changes: 3 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -2,6 +2,9 @@ name: Testing

on:
pull_request:
push:
branches:
- 2.x

jobs:

0 comments on commit 22388ad

Please sign in to comment.