Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .github/scripts/release-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ echo "$release_notes$(cat $root/changelog.md)" > $root/changelog.md

# generate SDK
cd "$root"
make gen
sed -i "<outscale-api-version>s|.*|${new_api_version}</outscale-api-version>|" pom.xml

# setup git && commit
git config user.name "Outscale Bot"
git config user.email "opensource+bot@outscale.com"
for f in src dist; do
for f in src dist pom.xml; do
git add $f || true
done
git commit -asm "osc-sdk-java v$new_sdk_version"
11 changes: 8 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,30 @@ on:
description: 'Outscale API version'
required: true

permissions:
contents: write

jobs:
auto-build:
environment: auto-build
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v5
with:
ref: main
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '11'
cache: 'maven'

- name: Write Outscale API version to use
run: echo "${{ github.event.inputs.api_version }}" > api_version
- name: check for release duplicate
env:
GH_TOKEN: ${{ secrets.GH_TOKEN }}
run: make release-check-duplicate

- name: auto-generate release
run: make release-build
- name: push release branch
Expand All @@ -34,4 +39,4 @@ jobs:
- name: create pull request
run: make release-pr
env:
GH_TOKEN: ${{ secrets.GH_TOKEN }}
GH_TOKEN: ${{ secrets.GH_TOKEN }}
15 changes: 7 additions & 8 deletions .github/workflows/cred-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,17 @@ name: Credential Scanner

on:
pull_request:
branches:
- main
push:
branches:
- main
branches: [ main ]

permissions:
contents: read

jobs:
cred-scan:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v5
- name: Scan credentials
uses: outscale-dev/cred-scan@main
uses: outscale/cred-scan@main
with:
scan_path: "./"
7 changes: 5 additions & 2 deletions .github/workflows/github-sanity-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,14 @@ on:
pull_request:
branches: [ main ]

permissions:
contents: read

jobs:
github-sanity-scan:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v5
- name: Github sanity scanner
uses: outscale/github-sanity-scan@main
with:
Expand Down
11 changes: 8 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
name: osc-sdk-java maven publishing

on:
release:
types: [released]

permissions:
contents: read

jobs:
publish:
environment: publish
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v5
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
Expand All @@ -18,9 +22,10 @@ jobs:
server-username: SONATYPE_USERNAME
server-password: SONATYPE_PASSWORD
gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}

- name: Publish
run: mvn deploy
env:
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
21 changes: 5 additions & 16 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ permissions:

jobs:
reuse-test:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v5
- name: Reuse specification test
run: make reuse-test
examples-test:
environment: eu-west-2
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v5
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
Expand All @@ -35,19 +35,8 @@ jobs:
OSC_USERNAME: ${{ secrets.OSC_USERNAME }}
OSC_PASSWORD: ${{ secrets.OSC_PASSWORD }}
run: make examples-test
regeneration-test:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '11'
cache: 'maven'
- name: SDK re-generation test
run: make regen-test
dependabot-auto-merge:
needs: [reuse-test, examples-test, regeneration-test]
needs: [reuse-test, examples-test]
runs-on: ubuntu-latest
if: ${{ github.actor == 'dependabot[bot]' }}
steps:
Expand Down
91 changes: 0 additions & 91 deletions .osc-api-patches/outscale-yaml.patch

This file was deleted.

This file was deleted.

Loading
Loading