Skip to content

Commit ceadca6

Browse files
committed
Merge branch 'master' of YangSen-qn:qiniu/objc-sdk into develop
2 parents b5d6e3e + 8c893b6 commit ceadca6

File tree

5 files changed

+31
-27
lines changed

5 files changed

+31
-27
lines changed

.github/workflows/ci-test.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
on: [push]
2+
name: Run Test Cases
3+
jobs:
4+
test-on-mac:
5+
runs-on: macos-10.15
6+
steps:
7+
- name: Checkout repo
8+
uses: actions/checkout@v2
9+
with:
10+
ref: ${{ github.ref }}
11+
- name: Setup Ruby 2.6
12+
uses: actions/setup-ruby@v1
13+
with:
14+
ruby-version: '2.6'
15+
- name: Setup Environment
16+
run: |
17+
gem install cocoapods --pre --quiet --silent --no-document
18+
rm -rf $HOME/.cocoapods
19+
pod setup --silent
20+
pod install --silent --no-repo-update
21+
- name: Run Cases
22+
env:
23+
QINIU_TEST_ENV: travis
24+
run: |
25+
xcodebuild test -workspace QiniuSDK.xcworkspace -scheme QiniuSDK_iOS -configuration Debug -destination 'platform=iOS Simulator,OS=14.2,name=iPhone 8 Plus' -enableCodeCoverage YES
26+
xcodebuild test -workspace QiniuSDK.xcworkspace -scheme QiniuSDK_Mac -configuration Debug -destination 'platform=macOS,arch=x86_64'
27+
bash <(curl -s https://codecov.io/bash)

.travis.yml

Lines changed: 0 additions & 24 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#Changelog
2-
## 8.1.0(2020-12-25)
2+
## 8.1.0(2020-12-29)
33
## 增加
44
- 支持分片V2
55
- 支持自定义meta

QiniuSDK/Storage/QNUploadFileInfoPartV2.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ - (BOOL)isEmpty{
137137
}
138138

139139
- (BOOL)isValid{
140-
return ![self isEmpty] && self.uploadId && (self.expireAt.integerValue - [[NSDate date] timeIntervalSince1970]) > 6000;
140+
return ![self isEmpty] && self.uploadId && (self.expireAt.integerValue - [[NSDate date] timeIntervalSince1970]) > 3600*24;
141141
}
142142

143143
- (NSArray <NSDictionary *> *)getPartInfoArray{

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
[![@qiniu on weibo](http://img.shields.io/badge/weibo-%40qiniutek-blue.svg)](http://weibo.com/qiniutek)
44
[![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg)](LICENSE.md)
5-
[![Build Status](https://travis-ci.org/qiniu/objc-sdk.svg?branch=master)](https://travis-ci.org/qiniu/objc-sdk)
5+
[![Build Status](https://github.com/qiniu/objc-sdk/workflows/Run%20Test%20Cases/badge.svg)](https://github.com/qiniu/objc-sdk/actions)
6+
[![Badge w/ Version](https://cocoapod-badges.herokuapp.com/v/Qiniu/badge.png)](http://cocoadocs.org/docsets/Qiniu)
67
[![GitHub release](https://img.shields.io/github/v/tag/qiniu/objc-sdk.svg?label=release)](https://github.com/qiniu/objc-sdk/releases)
78
[![codecov](https://codecov.io/gh/qiniu/objc-sdk/branch/master/graph/badge.svg)](https://codecov.io/gh/qiniu/objc-sdk)
89
![Platform](http://img.shields.io/cocoapods/p/Qiniu.svg)

0 commit comments

Comments
 (0)