Skip to content

Commit

Permalink
fix CI
Browse files Browse the repository at this point in the history
  • Loading branch information
pcalouche committed Aug 3, 2024
1 parent 996fcf1 commit 7bb168c
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 14 deletions.
13 changes: 10 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
version: 2
registries:
github:
central:
type: "maven-repository"
url: "https://maven.pkg.github.com/pcalouche"
url: "https://repo.maven.apache.org/maven2"
github-pcalouche-spring-forge:
type: "maven-repository"
url: "https://maven.pkg.github.com/pcalouche/spring-forge"
username: pcalouche
password: "${{ secrets.PCALOUCHE_READ_PACKAGE_TOKEN }}"
updates:
- package-ecosystem: "maven"
directory: "/"
registries: "*"
registries:
- central
- github-pcalouche-spring-forge
schedule:
interval: "weekly"
target-branch: "main"
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@ name: Continuous Integration

on:
push:
branches-ignore:
- main

permissions:
contents: write
contents: read
packages: read

concurrency:
Expand All @@ -29,7 +27,7 @@ jobs:
distribution: 'temurin'
cache: maven
- name: Run Maven
run: mvn -B clean verify
run: mvn -B -s ./.mvn/settings.xml clean verify
env:
GITHUB_ACTOR: ${{ github.actor }}
GITHUB_TOKEN: ${{ github.token }}
19 changes: 14 additions & 5 deletions .mvn/settings.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,20 @@
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
<?xml version="1.0" encoding="UTF-8"?>
<settings
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd"
xmlns="http://maven.apache.org/SETTINGS/1.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

<servers>
<server>
<id>github</id>
<id>github-pcalouche-spring-forge</id>
<username>${env.GITHUB_ACTOR}</username>
<password>${env.GITHUB_TOKEN}</password>
</server>
<server>
<id>github-pcalouche-spring-boot-excel</id>
<username>${env.GITHUB_ACTOR}</username>
<password>${env.GITHUB_TOKEN}</password>
</server>
</servers>
</settings>

</settings>
16 changes: 14 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@
<version>1.0.0-SNAPSHOT</version>
<name>Excel Export Spring Boot Example</name>

<distributionManagement>
<repository>
<id>github-pcalouche-spring-boot-excel</id>
<name>Spring Boot Excel</name>
<url>https://maven.pkg.github.com/pcalouche/spring-boot-excel</url>
</repository>
</distributionManagement>

<dependencies>
<dependency>
<groupId>dev.pcalouche.springforge.spring33x</groupId>
Expand Down Expand Up @@ -42,12 +50,16 @@
</dependencies>

<repositories>
<repository>
<id>central</id>
<url>https://repo.maven.apache.org/maven2</url>
</repository>
<repository>
<snapshots>
<enabled>true</enabled>
</snapshots>
<id>github</id>
<url>https://maven.pkg.github.com/pcalouche</url>
<id>github-pcalouche-spring-forge</id>
<url>https://maven.pkg.github.com/pcalouche/spring-forge</url>
</repository>
</repositories>

Expand Down

0 comments on commit 7bb168c

Please sign in to comment.