Skip to content

Commit 07ac696

Browse files
authored
Switch master -> main (#53)
* Switch master -> main * fetch remote master hash * Use 'checkout@v3' everywhere
1 parent 9a15f79 commit 07ac696

File tree

14 files changed

+70
-24
lines changed

14 files changed

+70
-24
lines changed

.editorconfig

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# EditorConfig is awesome: https://EditorConfig.org
2+
3+
# top-most EditorConfig file
4+
root = true
5+
6+
[*]
7+
charset = utf-8
8+
end_of_line = lf
9+
insert_final_newline = true
10+
trim_trailing_whitespace = true
11+
12+
[*.py]
13+
indent_style = space
14+
indent_size = 4
15+
max_line_length = 120
16+
17+
[CODEOWNERS]
18+
indent_style = tab

.github/workflows/check-codegen.yml

Lines changed: 29 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,52 @@
33
name: CI
44

55
# Controls when the action will run. Triggers the workflow on push or pull request
6-
# events but only for the master branch
6+
# events but only for the main branch
77
on:
88
push:
9-
branches: [ master ]
9+
branches: [ master, main ]
1010
pull_request:
11-
branches: [ master ]
11+
branches: [ master, main ]
1212

1313
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
1414
jobs:
1515
# This workflow contains a single job called "build"
16-
build:
16+
check-submodules:
1717
# The type of runner that the job will run on
1818
runs-on: ubuntu-latest
1919

2020
# Steps represent a sequence of tasks that will be executed as part of the job
2121
steps:
2222
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
23-
- uses: actions/checkout@v2
24-
25-
- name: Check all commits in git submodules available
26-
run: git submodule init && git submodule update --recursive --remote
23+
- uses: actions/checkout@v3
24+
with:
25+
submodules: recursive
2726

2827
- name: Check all submodules up-to-date
2928
run: git diff --exit-code
3029

30+
check-master:
31+
runs-on: ubuntu-latest
32+
needs: [check-submodules]
33+
steps:
34+
- uses: actions/checkout@v3
35+
with:
36+
submodules: recursive
37+
38+
- name: Check master points to main
39+
run: |
40+
for s in ./submodules/*/ ; do
41+
pushd "$s"
42+
rem_master_hash=$(git ls-remote --exit-code --quiet --heads origin master | awk '{ print $1}')
43+
git diff --exit-code ${rem_master_hash} || (echo "Broken Master in $s" ; exit 1)
44+
popd > /dev/null
45+
done
46+
47+
check-urls:
48+
runs-on: ubuntu-latest
49+
steps:
50+
- uses: actions/checkout@v3
51+
3152
- name: Check all URLs
3253
run: ./scripts/check_all_urls.sh
3354

CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* denis.averin@aspose.com

codegen/Templates/csharp/README.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Aspose.BarCode Cloud SDK for .NET
22

33
[![License](https://img.shields.io/github/license/aspose-barcode-cloud/aspose-barcode-cloud-dotnet)](LICENSE)
4-
[![.NET Core](https://github.com/aspose-barcode-cloud/aspose-barcode-cloud-dotnet/actions/workflows/dotnet-core.yml/badge.svg?branch=master)](https://github.com/aspose-barcode-cloud/aspose-barcode-cloud-dotnet/actions/workflows/dotnet-core.yml)
5-
[![.NET Framework](https://github.com/aspose-barcode-cloud/aspose-barcode-cloud-dotnet/actions/workflows/net-framework.yml/badge.svg?branch=master)](https://github.com/aspose-barcode-cloud/aspose-barcode-cloud-dotnet/actions/workflows/net-framework.yml)
4+
[![.NET Core](https://github.com/aspose-barcode-cloud/aspose-barcode-cloud-dotnet/actions/workflows/dotnet-core.yml/badge.svg)](https://github.com/aspose-barcode-cloud/aspose-barcode-cloud-dotnet/actions/workflows/dotnet-core.yml)
5+
[![.NET Framework](https://github.com/aspose-barcode-cloud/aspose-barcode-cloud-dotnet/actions/workflows/net-framework.yml/badge.svg)](https://github.com/aspose-barcode-cloud/aspose-barcode-cloud-dotnet/actions/workflows/net-framework.yml)
66
[![Nuget](https://img.shields.io/nuget/v/Aspose.BarCode-Cloud)](https://www.nuget.org/packages/Aspose.BarCode-Cloud/)
77

88
- API version: {{appVersion}}

codegen/Templates/java/pom.mustache

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>{{groupId}}</groupId>
55
<artifactId>{{artifactId}}</artifactId>
@@ -35,13 +35,19 @@
3535

3636
<distributionManagement>
3737
<repository>
38-
<id>central</id>
39-
<name>repository.aspose.cloud-releases</name>
40-
<url>https://repository.aspose.cloud/repo</url>
38+
<id>aspose-cloud-s3-repo-ci</id>
39+
<url>s3://data.repository.aspose.cloud/repo/</url>
4140
</repository>
4241
</distributionManagement>
4342

4443
<build>
44+
<extensions>
45+
<extension>
46+
<groupId>com.github.seahen</groupId>
47+
<artifactId>maven-s3-wagon</artifactId>
48+
<version>1.3.3</version>
49+
</extension>
50+
</extensions>
4551
<plugins>
4652
<plugin>
4753
<groupId>org.apache.maven.plugins</groupId>

scripts/switch_all_submodules_to_master.bash renamed to scripts/switch_all_submodules_to_main.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ pushd "$(dirname "$0")/../submodules"
77
for d in */ ; do
88
pushd "$d"
99

10-
git switch master && git pull --ff-only
10+
git fetch && git switch main && git pull --ff-only
1111

1212
popd > /dev/null
1313
done

0 commit comments

Comments
 (0)