Skip to content

Commit

Permalink
repo-sync-2024-03-15T15:32:21+0800
Browse files Browse the repository at this point in the history
  • Loading branch information
haha-zwx-ooo authored and 雨土 committed Mar 15, 2024
1 parent a9a737f commit 181b1f9
Show file tree
Hide file tree
Showing 300 changed files with 12,929 additions and 3,041 deletions.
77 changes: 77 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
# Copyright 2024 Ant Group Co., Ltd.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

version: 2.1

setup: true

orbs:
continuation: circleci/[email protected]

parameters:
GHA_Actor:
type: string
default: ""
GHA_Action:
type: string
default: ""
GHA_Event:
type: string
default: ""
GHA_Meta:
type: string
default: ""

jobs:
build-and-push:
docker:
- image: cimg/openjdk:17.0
steps:
- checkout
- setup_remote_docker
- run:
name: Test
command: make test
- run:
name: Build Docker image
command: make image
- run:
name: Push to Docker Hub
command: |
# login secretpad dockerhub registry
docker login -u ${DOCKER_DEPLOY_USERNAME} -p ${DOCKER_DEPLOY_TOKEN}
# login secretpad aliyun registry
docker login -u ${ALIYUN_DOCKER_USERNAME} -p ${ALIYUN_DOCKER_PASSWORD} secretflow-registry.cn-hangzhou.cr.aliyuncs.com
echo "$DOCKERHUB_PASSWORD" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
CIRCLETAG=$(echo ${CIRCLE_TAG} | sed 's/v//')
docker tag $(docker images --format "{{.Repository}}:{{.Tag}}" | sed -n '1p') secretflow-registry.cn-hangzhou.cr.aliyuncs.com/secretflow/secretpad:latest
docker tag $(docker images --format "{{.Repository}}:{{.Tag}}" | sed -n '1p') secretflow/secretpad:latest
docker tag $(docker images --format "{{.Repository}}:{{.Tag}}" | sed -n '1p') secretflow-registry.cn-hangzhou.cr.aliyuncs.com/secretflow/secretpad:${CIRCLETAG}
docker tag $(docker images --format "{{.Repository}}:{{.Tag}}" | sed -n '1p') secretflow/secretpad:${CIRCLETAG}
docker push secretflow/secretpad:${CIRCLETAG}
docker push secretflow-registry.cn-hangzhou.cr.aliyuncs.com/secretflow/secretpad:${CIRCLETAG}
docker push secretflow-registry.cn-hangzhou.cr.aliyuncs.com/secretflow/secretpad:latest
docker push secretflow/secretpad:latest
workflows:
version: 2
build-deploy:
jobs:
- build-and-push:
filters:
branches:
ignore: /.*/
tags:
only: /^v.*/
28 changes: 28 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<!-- Here is for bug reports and feature requests ONLY!
If you're looking for help, please check our mail list、WeChat group and the Gitter room.
Please try to use English to describe your issue, or at least provide a snippet of English translation.
我们鼓励使用英文,如果不能直接使用,可以使用翻译软件,您仍旧可以保留中文原文。
-->

## Issue Description

Type: *bug report* or *feature request*

### Describe what happened (or what feature you want)


### Describe what you expected to happen


### How to reproduce it (as minimally and precisely as possible)

1.
2.
3.

### Tell us your environment


### Anything else we need to know?
44 changes: 44 additions & 0 deletions .github/ISSUE_TEMPLATE/bug-report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''

---

<!-- Here is for bug reports and feature requests ONLY!
If you're looking for help, please check our mail list、WeChat group and the Gitter room.
Please try to use English to describe your issue, or at least provide a snippet of English translation.
我们鼓励使用英文,如果不能直接使用,可以使用翻译软件,您仍旧可以保留中文原文。
-->

**Describe the bug**
A clear and concise description of what the bug is.

**Expected behavior**
A clear and concise description of what you expected to happen.

**Actually behavior**
A clear and concise description of what you actually to happen.

**How to Reproduce**
Steps to reproduce the behavior:

1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See errors

**Desktop (please complete the following information):**

- OS: [e.g. Centos]
- Docker: [e.g. Docker version 19.03.8]
- Version [e.g. secretpad 0.4.0, kuscia 0.6.0, secretflow 0.5.0]
- Mode [e.g. center, edge, p2p]
- Build [e.g. mpc, custom]

**Additional context**
Add any other context about the problem here.
28 changes: 28 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''

---

<!-- Here is for bug reports and feature requests ONLY!
If you're looking for help, please check our mail list、WeChat group and the Gitter room.
Please try to use English to describe your issue, or at least provide a snippet of English translation.
我们鼓励使用英文,如果不能直接使用,可以使用翻译软件,您仍旧可以保留中文原文。
-->

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
37 changes: 37 additions & 0 deletions .github/ISSUE_TEMPLATE/old-issue-template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
---
name: Old issue template
about: Describe this issue template's purpose here.
title: ''
labels: ''
assignees: ''

---

<!-- Here is for bug reports and feature requests ONLY!
If you're looking for help, please check our mail list、WeChat group and the Gitter room.
Please try to use English to describe your issue, or at least provide a snippet of English translation.
我们鼓励使用英文,如果不能直接使用,可以使用翻译软件,您仍旧可以保留中文原文。
-->

## Issue Description

Type: *bug report* or *feature request*

### Describe what happened (or what feature you want)


### Describe what you expected to happen


### How to reproduce it (as minimally and precisely as possible)

1.
2.
3.

### Tell us your environment


### Anything else we need to know?
18 changes: 16 additions & 2 deletions .github/workflows/cla.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,24 @@
# Copyright 2024 Ant Group Co., Ltd.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

---
name: CLA Assistant
on:
issue_comment:
types: [created]
types: [ created ]
pull_request_target:
types: [opened, closed, synchronize]
types: [ opened, closed, synchronize ]
jobs:
CLAssistant:
uses: secretflow/.github/.github/workflows/cla.yml@main
Expand Down
48 changes: 48 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
# Copyright 2024 Ant Group Co., Ltd.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

name: Test

on: [ push, pull_request ]

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: '17'

- name: Cache Maven packages
uses: actions/cache@v3
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-m2
- name: Build with Maven
run: mvn clean test

- name: Add coverage to PR
uses: madrapps/[email protected]
with:
paths: |
${{ github.workspace }}/test/target/site/jacoco.xml
token: ${{ secrets.GITHUB_TOKEN }}
min-coverage-overall: 40
min-coverage-changed-files: 40
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ target/
!**/src/test/resources/certs/
secretpad-api/client-java-kusciaapi/**/kusciaapi/
secretpad-api/client-java-kusciaapi/**/common/
secretpad-api/client-java-kusciaapi/**/serving/
secretpad-service/**/org/secretflow/proto/
secretpad-service/**/com/secretflow/spec/v1/
secretpad-web/config
Expand All @@ -48,3 +49,5 @@ build/**/settings.xml
docs/_build

.java-version
/test/TEST-secretpad.xml
/.jpb/
27 changes: 26 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,31 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
`Fixed` for any bug fixes.
`Security` in case of vulnerabilities.

## [v0.5.0b0] - 2024-03-15

### Added

- dag model export
- Model Management (Publishing, Deactivating, Deprecating, Deleting)
- Model HTTP(SPI) feature service management
- secreflow model export, GLM optimization, the ability to save additional feature columns to the results of
the prediction operator, the binning modification function, and the PSI upgrade 0.0.2
- kusica 0.6.0 serving

### Fixed

- Data synchronization optimization reduces resource consumption
- log optimization
- springboot3.1.5 upgrade 3.19

## [v0.4.1b1] - 2024-02-02

### Fixed

- Fix edge node user update password url 404
- Fix graph edge del error
- Fix tee result download error

## [v0.4.1b0] - 2024-1-26

### Added
Expand Down Expand Up @@ -44,7 +69,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- In the P2P mode, the creation of platform projects requires the approval of the invitee
- The model prediction (SecureBoost) component is optimized to support batch prediction

## [0.3.0b0] - 2024-11-12
## [0.3.0b0] - 2023-11-12

### Added

Expand Down
Loading

0 comments on commit 181b1f9

Please sign in to comment.