Skip to content

Commit 8c5f3df

Browse files
d80tb7d80tb7
committed
merge master
Signed-off-by: Chris Martin <[email protected]>
2 parents adb6887 + 6bbe6cc commit 8c5f3df

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+1769
-351
lines changed

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ jobs:
2424
- uses: goreleaser/goreleaser-action@v5
2525
with:
2626
distribution: goreleaser
27-
version: v1.24.0
28-
args: release --snapshot --skip-sbom --skip-sign --clean
27+
version: v2.8.1
28+
args: release --snapshot --skip=sbom,sign --clean
2929
env:
3030
DOCKER_REPO: "gresearch"
3131
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

‎.github/workflows/python-client.yml‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,25 @@ on:
2828
- 'scripts/build-python-client.sh'
2929
- 'makefile'
3030
- '.github/workflows/python-tests/*'
31+
- './magefiles/tests.go'
32+
- './magefiles/python.go'
3133

3234
jobs:
3335
python-client-tox:
3436
runs-on: ubuntu-22.04
3537
strategy:
38+
fail-fast: false
3639
matrix:
37-
python: [ '3.9', '3.10', '3.11', '3.12' ]
40+
python-version: [ '3.9', '3.10', '3.11', '3.12' ]
3841
include:
3942
- tox-env: 'py39'
40-
python: '3.9'
43+
python-version: '3.9'
4144
- tox-env: 'py310'
42-
python: '3.10'
45+
python-version: '3.10'
4346
- tox-env: 'py311'
44-
python: '3.11'
47+
python-version: '3.11'
4548
- tox-env: 'py312'
46-
python: '3.12'
49+
python-version: '3.12'
4750
steps:
4851
- uses: actions/checkout@v4
4952
- name: Setup Go
@@ -52,10 +55,10 @@ jobs:
5255
cache-prefix: python-client-tox
5356
- uses: ./.github/workflows/python-tests
5457
with:
55-
python-version: ${{ matrix.python }}
58+
python-version: ${{ matrix.python-version }}
5659
tox-env: ${{ matrix.tox-env }}
5760
path: 'client/python'
58-
github-token: ${{secrets.GITHUB_TOKEN}}
61+
github-token: ${{ secrets.GITHUB_TOKEN }}
5962

6063
python-client-integration-tests:
6164
if: github.repository_owner == 'armadaproject'

‎.github/workflows/scala-client-release-to-maven.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-22.04
99
# secrets are provided by environment
1010
environment:
11-
name: scala-release
11+
name: maven-release
1212
# a different URL for each point in the matrix, but the same URLs accross commits
1313
url: 'https://github.com/armadaproject/armada/tree/master/client/scala/armada-scala-client?scala=${{ matrix.scala-version }}'
1414
permissions: {}

‎.github/workflows/scala-client.yml‎

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
name: Scala Client
2+
3+
on:
4+
push:
5+
branches-ignore:
6+
- master
7+
paths:
8+
- 'client/scala/**'
9+
- 'build/scala-client/**'
10+
- 'pkg/api/*.proto'
11+
- '.github/workflows/scala-client.yml'
12+
- 'docs/armada_scala_client.md'
13+
- 'scripts/build-scala-client.sh'
14+
- 'makefile'
15+
- './magefiles/scala.go'
16+
17+
pull_request:
18+
branches-ignore:
19+
- gh-pages
20+
paths:
21+
- 'client/scala/**'
22+
- 'build/scala-client/**'
23+
- 'pkg/api/*.proto'
24+
- '.github/workflows/scala-client.yml'
25+
- 'docs/armada_scala_client.md'
26+
- 'scripts/build-scala-client.sh'
27+
- 'makefile'
28+
- './magefiles/scala.go'
29+
30+
jobs:
31+
scala-client-test:
32+
runs-on: ubuntu-latest
33+
strategy:
34+
fail-fast: false
35+
matrix:
36+
scala-version: [ '2.12.18', '2.13.15' ]
37+
steps:
38+
- uses: actions/checkout@v4
39+
- name: Setup Go
40+
uses: ./.github/actions/setup-go-cache
41+
with:
42+
cache-prefix: scala-client-test
43+
- name: Install Protoc
44+
uses: arduino/setup-protoc@v3
45+
with:
46+
version: '23.3'
47+
repo-token: ${{ secrets.GITHUB_TOKEN }}
48+
- name: Restore Maven packages cache
49+
uses: actions/cache@v4
50+
with:
51+
path: ~/.m2/repository
52+
key: ${{ runner.os }}-mvn-build-${{ matrix.scala-version }}-${{ hashFiles('client/scala/armada-scala-client/pom.xml') }}
53+
restore-keys:
54+
${{ runner.os }}-mvn-build-${{ matrix.scala-version }}-${{ hashFiles('client/scala/armada-scala-client/pom.xml') }}
55+
${{ runner.os }}-mvn-build-${{ matrix.scala-version }}-
56+
- name: Setup JDK
57+
uses: actions/setup-java@v4
58+
with:
59+
distribution: 'temurin'
60+
java-version: '11'
61+
- name: Set Scala version
62+
working-directory: client/scala/armada-scala-client
63+
run: |
64+
./set-scala-version.sh ${{ matrix.scala-version }}
65+
git diff
66+
shell: bash
67+
- name: Bootstrap Proto files
68+
run: go run github.com/magefile/[email protected] -v BootstrapProto
69+
shell: bash
70+
- name: Fetch mvn dependencies
71+
working-directory: client/scala/armada-scala-client
72+
run: mvn --batch-mode dependency:go-offline
73+
shell: bash
74+
- name: Generate Scala from proto
75+
working-directory: client/scala/armada-scala-client
76+
run: |
77+
# Generate Scala from proto
78+
echo "::group::generate sources"
79+
mvn --batch-mode generate-sources
80+
echo "::endgroup::"
81+
82+
echo "::group::generated scala files"
83+
find target/generated-sources/
84+
echo "::endgroup::"
85+
shell: bash
86+
- name: Compile package
87+
working-directory: client/scala/armada-scala-client
88+
run: mvn --batch-mode compile -Dspotless.check.skip
89+
shell: bash
90+
- name: Test package
91+
working-directory: client/scala/armada-scala-client
92+
run: mvn --batch-mode test -Dspotless.check.skip
93+
shell: bash
94+
- name: Check code style
95+
working-directory: client/scala/armada-scala-client
96+
run: |
97+
# Check code style
98+
echo "::group::check style"
99+
if ! mvn --batch-mode spotless:check
100+
then
101+
echo "::endgroup::"
102+
103+
echo "::group::apply style"
104+
mvn --batch-mode spotless:apply
105+
echo "::endgroup::"
106+
107+
echo "::group::style fixes"
108+
git checkout --quiet pom.xml
109+
git diff
110+
echo "::endgroup::"
111+
exit 1
112+
fi
113+
echo "::endgroup::"
114+
shell: bash
115+
- name: Create papackge
116+
working-directory: client/scala/armada-scala-client
117+
run: mvn --batch-mode package -DskipTests -Dspotless.check.skip
118+
shell: bash

‎.goreleaser.yml‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# yaml-language-server: $schema=https://goreleaser.com/static/schema.json
22

33
project_name: armada
4-
4+
version: 2
55
dist: "dist"
66

77
#gomod:
88
# proxy: true
99

1010
snapshot:
11-
name_template: "{{ .FullCommit }}"
11+
version_template: "{{ .FullCommit }}"
1212

1313
env:
1414
- GOPROXY={{ if index .Env "GOPROXY" }}{{ .Env.GOPROXY }}{{ else }}https://proxy.golang.org,direct{{ end }}
@@ -145,15 +145,13 @@ source:
145145
format: "zip"
146146

147147
archives:
148-
- id: armadactl
149-
builds:
150-
- armadactl
148+
- ids: [armadactl]
151149
allow_different_binary_count: true
152150
name_template: 'armadactl_{{ replace .Version "-" "_" }}_{{ .Os }}_{{ .Arch }}'
153-
format: tar.gz
151+
formats: [tar.gz]
154152
format_overrides:
155153
- goos: windows
156-
format: zip
154+
formats: [zip]
157155
files:
158156
- LICENSE
159157
- README.md

‎client/scala/armada-scala-client/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
<dependency>
8181
<groupId>com.thesamet.scalapb</groupId>
8282
<artifactId>scalapb-runtime-grpc_${scala.compat.version}</artifactId>
83-
<version>0.9.8</version>
83+
<version>0.11.13</version>
8484
</dependency>
8585
<dependency>
8686
<groupId>com.google.protobuf</groupId>
@@ -207,7 +207,7 @@
207207
<type>scalapb</type>
208208
<outputOptions>grpc</outputOptions> <!-- more scalapb options can be added here -->
209209
<outputDirectorySuffix>scala-${scala.compat.version}</outputDirectorySuffix>
210-
<pluginArtifact>com.thesamet.scalapb:protoc-gen-scala:0.9.8:sh:unix</pluginArtifact>
210+
<pluginArtifact>com.thesamet.scalapb:protoc-gen-scala:0.11.13:sh:unix</pluginArtifact>
211211
</outputTarget>
212212
</outputTargets>
213213
</configuration>

‎config/lookout/config.yaml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,14 @@ uiConfig:
3636
alertMessageMd: |
3737
This will only work if the container is still running.
3838
alertLevel: info
39+
pinnedTimeZoneIdentifiers:
40+
- America/New_York
41+
- Europe/London
42+
- Europe/Paris
43+
- Asia/Tokyo
44+
- Asia/Shanghai
45+
- America/Los_Angeles
46+
- America/Chicago
47+
- Australia/Sydney
48+
- Asia/Dubai
49+
- Asia/Kolkata

0 commit comments

Comments
 (0)