Skip to content

Commit

Permalink
move marketplace to it's own repo
Browse files Browse the repository at this point in the history
  • Loading branch information
gdams committed Oct 19, 2023
1 parent d782bd6 commit 74c4754
Show file tree
Hide file tree
Showing 467 changed files with 191 additions and 21,131 deletions.
1 change: 0 additions & 1 deletion .adr-dir

This file was deleted.

19 changes: 0 additions & 19 deletions .dockerignore

This file was deleted.

1,339 changes: 0 additions & 1,339 deletions .editorconfig

This file was deleted.

8 changes: 8 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@ updates:
schedule:
interval: "daily"
- package-ecosystem: docker
directory: "adoptium-marketplace-server/adoptium-repo/docker/"
schedule:
interval: "daily"
- package-ecosystem: docker
directory: "docker/"
schedule:
interval: "daily"
- package-ecosystem: gitsubmodule
directory: "/"
schedule:
interval: "daily"
57 changes: 0 additions & 57 deletions .github/workflows/build-docker.yml

This file was deleted.

54 changes: 38 additions & 16 deletions .github/workflows/build-marketplace.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,47 +4,69 @@
name: Marketplace build

on:
push:
branches: [ marketplace ]
pull_request:
branches: [ marketplace ]
branches: [ main, production ]
push:
branches: [ main, production ]

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

permissions:
contents: read

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
with:
submodules: true

- uses: actions/setup-java@v2
- uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
with:
java-version: '17'
distribution: 'temurin'
cache: 'maven'

- name: Get submodule SHA
id: get-submodule-sha
run: echo "SUBMODULE_SHA=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
working-directory: api.adoptium.net

- name: Cache api.adoptium.net build
uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
id: cache-api
with:
path: api.adoptium.net/target
key: api-build-${{ steps.get-submodule-sha.outputs.SUBMODULE_SHA }}
restore-keys: |
api-build-${{ steps.get-submodule-sha.outputs.SUBMODULE_SHA }}
- name: Build api
if: steps.cache-api.outputs.cache-hit != 'true'
working-directory: api.adoptium.net
run: ./mvnw --batch-mode clean install -Padoptium

- name: Build app
run: |
cd marketplace/
../mvnw --batch-mode clean install
- name: Build marketplace
run: ./mvnw --batch-mode clean install

- name: Upload yaml schema
uses: actions/upload-artifact@v2.3.1
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
with:
name: schema.yaml
path: marketplace/adoptium-marketplace-schema/target/generated/openapi.yaml
path: adoptium-marketplace-schema/target/generated/openapi.yaml

- name: Upload json schema
uses: actions/upload-artifact@v2.3.1
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
with:
name: schema.json
path: marketplace/adoptium-marketplace-schema/target/generated/openapi.json
path: adoptium-marketplace-schema/target/generated/openapi.json

- name: Upload example data
uses: actions/upload-artifact@v2.3.1
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
with:
name: example.json
path: marketplace/adoptium-marketplace-schema-tests/src/test/resources/net/adoptium/marketplace/schema/example.json
path: adoptium-marketplace-schema-tests/src/test/resources/net/adoptium/marketplace/schema/example.json
44 changes: 0 additions & 44 deletions .github/workflows/ci.yml

This file was deleted.

44 changes: 0 additions & 44 deletions .github/workflows/publish.yml

This file was deleted.

40 changes: 27 additions & 13 deletions .github/workflows/run-vendor-validation.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven

name: Marketplace build
name: Vendor Validation

on:
workflow_dispatch:
Expand All @@ -12,24 +12,38 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/setup-java@v2
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
with:
submodules: true

- uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
with:
java-version: '17'
java-package: jdk
architecture: x64
distribution: 'temurin'

- uses: actions/checkout@v3
cache: 'maven'

- name: Get submodule SHA
id: get-submodule-sha
run: echo "SUBMODULE_SHA=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
working-directory: api.adoptium.net

- name: Cache api.adoptium.net build
uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
id: cache-api
with:
path: api.adoptium.net/target
key: api-build-${{ steps.get-submodule-sha.outputs.SUBMODULE_SHA }}
restore-keys: |
api-build-${{ steps.get-submodule-sha.outputs.SUBMODULE_SHA }}
- name: Build api
if: steps.cache-api.outputs.cache-hit != 'true'
working-directory: api.adoptium.net
run: ./mvnw --batch-mode clean install -Padoptium -DskipTests

- name: Build app
run: |
cd marketplace/
../mvnw --batch-mode clean install -DskipTests
- name: Build marketplace
run: ./mvnw --batch-mode clean install -DskipTests

- name: Validate vendors
run: |
cd marketplace/adoptium-marketplace-vendor-validation
VALIDATE_REPO=true ../../mvnw --batch-mode clean test
working-directory: adoptium-marketplace-vendor-validation
run: VALIDATE_REPO=true ../mvnw --batch-mode clean test
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[submodule "api.adoptium.net"]
path = api.adoptium.net
url = https://github.com/adoptium/api.adoptium.net
branch = marketplace
37 changes: 0 additions & 37 deletions .s2i/bin/assemble

This file was deleted.

7 changes: 0 additions & 7 deletions .s2i/bin/save-artifacts

This file was deleted.

Loading

0 comments on commit 74c4754

Please sign in to comment.