Skip to content

Commit

Permalink
Merge pull request #23 from trykovyura/release/v1.0.0
Browse files Browse the repository at this point in the history
Release/v1.0.0
  • Loading branch information
trykovyura authored Nov 8, 2020
2 parents 010a2c7 + 9a9f538 commit f689e07
Show file tree
Hide file tree
Showing 213 changed files with 3,940 additions and 760 deletions.
6 changes: 6 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Документация - https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners
# У владельцев автоматически запросят review(если PR не draft)
# Синтаксис аналогичен .gitignore

# Глобально
* @trykovyura @bondarchukss
4 changes: 4 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Add 'CI' label to any github or fastlane file changes
CI:
- '.github/**'
- 'fastlane/**'
32 changes: 32 additions & 0 deletions .github/workflows/develop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Develop

on:
push:
branches: [ develop ]

jobs:
build:

runs-on: self-hosted
timeout-minutes: 30

steps:
- uses: actions/checkout@v2
- name: Bundle
run: bundle install
- name: Certificates
env:
MATCH_GIT_BASIC_AUTHORIZATION: ${{ secrets.MATCH_GIT_BASIC_AUTHORIZATION }}
MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
LOGIN_KEYCHAIN_PASSWORD: ${{ secrets.LOGIN_KEYCHAIN_PASSWORD }}
run: |
bundle exec fastlane unlock_keychain_ci
bundle exec fastlane certificates
- name: Prepare
run: bundle exec fastlane prepare
- name: Increment
run: bundle exec fastlane increment
- name: Build
env:
FASTLANE_XCODEBUILD_SETTINGS_RETRIES: ${{ secrets.FASTLANE_XCODEBUILD_SETTINGS_RETRIES }}
run: bundle exec fastlane build_feature
37 changes: 37 additions & 0 deletions .github/workflows/feature.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Feature

on:
push:
branches: [ feature/* ]

jobs:
build:

runs-on: self-hosted
timeout-minutes: 30

steps:
- uses: actions/checkout@v2
- name: Bundle
run: bundle install
- name: Certificates
env:
MATCH_GIT_BASIC_AUTHORIZATION: ${{ secrets.MATCH_GIT_BASIC_AUTHORIZATION }}
MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
LOGIN_KEYCHAIN_PASSWORD: ${{ secrets.LOGIN_KEYCHAIN_PASSWORD }}
run: |
bundle exec fastlane unlock_keychain_ci
bundle exec fastlane certificates
- name: Prepare
run: bundle exec fastlane prepare
- name: Increment
run: bundle exec fastlane increment
- name: Build
env:
FASTLANE_XCODEBUILD_SETTINGS_RETRIES: ${{ secrets.FASTLANE_XCODEBUILD_SETTINGS_RETRIES }}
run: bundle exec fastlane build_feature
- name: Deploy
env:
FIREBASE_APP: ${{ secrets.FIREBASE_APP }}
FIREBASE_TOKEN: ${{ secrets.FIREBASE_TOKEN }}
run: bundle exec fastlane upload_firebase
12 changes: 12 additions & 0 deletions .github/workflows/label.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: Labeler
on: [pull_request]

jobs:
label:

runs-on: self-hosted

steps:
- uses: actions/labeler@v2
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
38 changes: 38 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: Release

on:
push:
branches: [ release/* ]

jobs:
build:

runs-on: self-hosted
timeout-minutes: 30

steps:
- uses: actions/checkout@v2
- name: Prepare
run: bundle install
- name: Certificates
env:
MATCH_GIT_BASIC_AUTHORIZATION: ${{ secrets.MATCH_GIT_BASIC_AUTHORIZATION }}
MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
LOGIN_KEYCHAIN_PASSWORD: ${{ secrets.LOGIN_KEYCHAIN_PASSWORD }}
run: |
bundle exec fastlane unlock_keychain_ci
bundle exec fastlane certificates
- name: Prepare
run: bundle exec fastlane prepare
- name: Increment
run: bundle exec fastlane increment
- name: Build
env:
FASTLANE_XCODEBUILD_SETTINGS_RETRIES: ${{ secrets.FASTLANE_XCODEBUILD_SETTINGS_RETRIES }}
run: bundle exec fastlane build_release
- name: Deploy
env:
APP_STORE_CONNECT_API_KEY: ${{ secrets.APP_STORE_CONNECT_API_KEY }}
APP_STORE_CONNECT_API_KEY_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_ID }}
APP_STORE_CONNECT_API_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_API_ISSUER_ID }}
run: bundle exec fastlane upload_testflight
14 changes: 12 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Created by https://www.gitignore.io/api/xcode

*.xcodeproj
*.xcworkspace

### OSX ###
*.DS_Store
.AppleDouble
Expand Down Expand Up @@ -32,7 +35,7 @@ Temporary Items
## Build generated
build/
DerivedData/
youvote-ios.xcworkspace
SupportingFiles/Info.plist

## Various settings
*.pbxuser
Expand All @@ -50,9 +53,12 @@ xcuserdata/
*.xccheckout
*.xcscmblueprint

### R.swift ###
*.generated.swift

### CocoaPods ###
/Pods
Podfile.lock
/Carthage

### AppCode ###
.idea
Expand All @@ -78,3 +84,7 @@ fastlane/test_output
*.mobileprovision
*.ipa
*.zip
/RK/SupportingFiles/Info.plist

### SPM ###
.build
8 changes: 8 additions & 0 deletions .swiftlint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
excluded: # paths to ignore during linting. Takes precedence over `included`.
- Carthage
- Pods
- RKTests
- RK/Resources/Rswift
- build
identifier_name:
min_length: 2
13 changes: 13 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Autogenerated by fastlane
#
# Ensure this file is checked in to source control!

source "https://rubygems.org"

gem 'fastlane'
gem 'cocoapods'
gem 'cocoapods-binary'
gem 'generamba', git: 'https://github.com/strongself/Generamba.git', branch: 'develop'

plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
eval_gemfile(plugins_path) if File.exist?(plugins_path)
73 changes: 73 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
# Проект [Роскачества](https://rskrf.ru/)
Проект с открытым исходным кодом для просмотра результатов проверки качества товаров

## Стек технологий
* iOS 13
* SwiftUI
* Combine

## Design

* [Figma](https://www.figma.com/file/fxfo3rDhoq7Gn9zmKluF4L2J/Roskachestvo?node-id=0%3A1)

## Task manager

* [Trello](https://trello.com/b/32FdkhHQ/roskachestvo)

## API

* [rskrf.ru](https://rskrf.ru/about/dev/)

## Requirements
* [homebrew](https://brew.sh/index_ru) - optional

* [R.swift](https://github.com/mac-cain13/R.swift)
* `brew install rswift`
* [swiftlint](https://github.com/realm/SwiftLint)
* `brew install swiftlint`

* [fastlane](https://github.com/fastlane/fastlane)

* [xcodegen](https://github.com/yonaskolb/XcodeGen)

* ruby

## 🔧 Что нужно, чтобы начать писать код

Все зависимости устанавливаются через Gemfile и brew (Не требуется SUDO)

* Добавить в .bash_profile `export GEM_HOME=~/.gem`

* Если нет Ruby, то установить `/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"`

* instructions to install ruby https://gorails.com/setup/osx/10.13-high-sierra

* `gem install bundler` - установка менеджера зависимостей bundler

* `bundle install` - установка зависимостей

* `bundle exec fastlane install_plugins` - установка плагинов fastlane(включая xcodegen)

* `bundle exec fastlane prepare` - генерация проекта и установка зависимостей

## 🚀 Что нужно знать перед работой над проектом?

**Основные положения**

* Мы разрабатываем на **Swift**
* Мы не используем сложные архитектурные паттерны, но следуем принципам [SOLID](https://www.youtube.com/watch?v=y7nxFXnEyrU)
* Разрабатываем мы по модели [gitflow](http://danielkummer.github.io/git-flow-cheatsheet/)

### [Git flow](https://danielkummer.github.io/git-flow-cheatsheet/index.ru_RU.html)

* `git flow init`

>Branch name for production releases: [master]
>Branch name for "next release" development: [develop]
>
>How to name your supporting branch prefixes?
>Feature branches? [feature/]
>Release branches? [release/]
>Hotfix branches? [hotfix/]
>Support branches? [support/]
>Version tag prefix? [v]
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
},
"colors" : [
{
"idiom" : "universal",
"color" : {
"color-space" : "srgb",
"components" : {
"red" : "0xF6",
"alpha" : "1.000",
"blue" : "0xF9",
"green" : "0xF7"
}
}
}
]
}
20 changes: 20 additions & 0 deletions RK/Resources/Color/Color.xcassets/Dove Gray.colorset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
},
"colors" : [
{
"idiom" : "universal",
"color" : {
"color-space" : "srgb",
"components" : {
"red" : "0x6F",
"alpha" : "1.000",
"blue" : "0x6F",
"green" : "0x6F"
}
}
}
]
}
20 changes: 20 additions & 0 deletions RK/Resources/Color/Color.xcassets/Ghost1.colorset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
},
"colors" : [
{
"idiom" : "universal",
"color" : {
"color-space" : "srgb",
"components" : {
"red" : "0xE6",
"alpha" : "1.000",
"blue" : "0xEB",
"green" : "0xE8"
}
}
}
]
}
20 changes: 20 additions & 0 deletions RK/Resources/Color/Color.xcassets/Ghost2.colorset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
},
"colors" : [
{
"idiom" : "universal",
"color" : {
"color-space" : "srgb",
"components" : {
"red" : "0xC8",
"alpha" : "1.000",
"blue" : "0xD3",
"green" : "0xCC"
}
}
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
},
"colors" : [
{
"idiom" : "universal",
"color" : {
"color-space" : "srgb",
"components" : {
"red" : "0x67",
"alpha" : "1.000",
"blue" : "0x79",
"green" : "0x8B"
}
}
}
]
}
Loading

0 comments on commit f689e07

Please sign in to comment.