Skip to content

Commit 4986d52

Browse files
dantelmomsftdantelmomsft
committed
Release 1.2.0 fix
1 parent 4742a0e commit 4986d52

File tree

13 files changed

+58
-28
lines changed

13 files changed

+58
-28
lines changed

‎.github/workflows/nightly-jobs.yaml

Lines changed: 33 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,47 @@ on:
77
- cron: '0 0 * * *' # Run at midnight every day
88
workflow_dispatch:
99

10+
permissions:
11+
id-token: write
12+
contents: read
13+
security-events: write
14+
1015
jobs:
11-
infra:
16+
validate-bicep:
1217
name: "Infra Biceps Validation"
1318
runs-on: ubuntu-latest
1419
steps:
1520
- name: Checkout
1621
uses: actions/checkout@v4
17-
18-
- name: Build Bicep for linting
22+
- name: Filter Changes
23+
uses: dorny/paths-filter@v2
24+
id: changes
25+
with:
26+
filters: |
27+
app-service:
28+
- 'deploy/app-service/**'
29+
aks:
30+
- 'deploy/aks/**'
31+
aca:
32+
- 'deploy/aca/**'
33+
- name: Build App Service Bicep for linting
34+
if: steps.changes.outputs.app-service == 'true'
35+
uses: azure/CLI@v1
36+
with:
37+
inlineScript: az config set bicep.use_binary_from_path=false && az bicep build -f deploy/app-service/infra/main.bicep --stdout
38+
39+
- name: Build AKS Bicep for linting
40+
if: steps.changes.outputs.aks == 'true'
41+
uses: azure/CLI@v1
42+
with:
43+
inlineScript: az config set bicep.use_binary_from_path=false && az bicep build -f deploy/aks/infra/main.bicep --stdout
44+
45+
- name: Build ACA Bicep for linting
46+
if: steps.changes.outputs.aca == 'true'
1947
uses: azure/CLI@v1
2048
with:
21-
inlineScript: az config set bicep.use_binary_from_path=false && az bicep build -f infra/main.bicep --stdout
22-
49+
inlineScript: az config set bicep.use_binary_from_path=false && az bicep build -f deploy/aca/infra/main.bicep --stdout
50+
2351
- name: Run Microsoft Security DevOps Analysis
2452
uses: microsoft/security-devops-action@v1
2553
id: msdo

‎app/backend/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</parent>
1111
<groupId>com.microsoft.openai.samples.rag</groupId>
1212
<artifactId>search-demo-java</artifactId>
13-
<version>1.2.0-SNAPSHOT</version>
13+
<version>1.2.0</version>
1414
<name>openai-search-demo-java</name>
1515
<description>This sample demonstrates a few approaches for creating ChatGPT-like experiences over your own data using the Retrieval Augmented Generation pattern</description>
1616
<properties>

‎app/frontend/package-lock.json

Lines changed: 2 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/frontend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "frontend",
33
"private": true,
4-
"version": "0.0.0",
4+
"version": "1.2.0",
55
"type": "module",
66
"engines": {
77
"node": ">=14.0.0"

‎app/indexer/cli/dependency-reduced-pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>indexer-parent</artifactId>
55
<groupId>com.microsoft.openai.samples</groupId>
6-
<version>1.2.0-SNAPSHOT</version>
6+
<version>1.2.0</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99
<artifactId>indexer-cli</artifactId>

‎app/indexer/cli/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.microsoft.openai.samples</groupId>
99
<artifactId>indexer-parent</artifactId>
10-
<version>1.2.0-SNAPSHOT</version>
10+
<version>1.2.0</version>
1111
<relativePath>../pom.xml</relativePath>
1212
</parent>
1313

@@ -22,7 +22,7 @@
2222
<dependency>
2323
<groupId>com.microsoft.openai.samples</groupId>
2424
<artifactId>indexer-core</artifactId>
25-
<version>1.2.0-SNAPSHOT</version>
25+
<version>1.2.0</version>
2626
</dependency>
2727
</dependencies>
2828

‎app/indexer/core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.microsoft.openai.samples</groupId>
99
<artifactId>indexer-parent</artifactId>
10-
<version>1.2.0-SNAPSHOT</version>
10+
<version>1.2.0</version>
1111
<relativePath>../pom.xml</relativePath>
1212
</parent>
1313

‎app/indexer/functions/pom.xml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
<parent>
77
<groupId>com.microsoft.openai.samples</groupId>
88
<artifactId>indexer-parent</artifactId>
9-
<version>1.2.0-SNAPSHOT</version>
9+
<version>1.2.0</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

1313

1414
<artifactId>indexer-functions</artifactId>
15-
<version>1.0-SNAPSHOT</version>
15+
<version>1.0</version>
1616

1717

1818
<properties>
@@ -31,7 +31,7 @@
3131
<dependency>
3232
<groupId>com.microsoft.openai.samples</groupId>
3333
<artifactId>indexer-core</artifactId>
34-
<version>1.0-SNAPSHOT</version>
34+
<version>1.2.0</version>
3535
</dependency>
3636
</dependencies>
3737

@@ -47,16 +47,18 @@
4747
<encoding>${project.build.sourceEncoding}</encoding>
4848
</configuration>
4949
</plugin>
50+
<!--
51+
Functions deployment generation is disabled as we are still figuring out how to make it azd compliant.
52+
The problem is that we haven't found a working example of passing the app name generated by azd provision as env variables to maven during azd package phase.
53+
That's because probably azd try to package the app before provision phase
5054
<plugin>
5155
<groupId>com.microsoft.azure</groupId>
5256
<artifactId>azure-functions-maven-plugin</artifactId>
5357
<version>${azure.functions.maven.plugin.version}</version>
5458
<configuration>
55-
<!-- function app name -->
56-
<!--suppress UnresolvedMavenProperty -->
59+
5760
<appName>${env.INDEXER_FUNCTIONAPP_NAME}</appName>
58-
<!-- function app resource group -->
59-
<!--suppress UnresolvedMavenProperty -->
61+
6062
<resourceGroup>${env.AZURE_RESOURCE_GROUP}</resourceGroup>
6163
<appSettings>
6264
<property>
@@ -74,6 +76,7 @@
7476
</execution>
7577
</executions>
7678
</plugin>
79+
</-->
7780
<!--Remove obj folder generated by .NET SDK in maven clean-->
7881
<plugin>
7982
<artifactId>maven-clean-plugin</artifactId>

‎app/indexer/microservice/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<groupId>com.microsoft.openai.samples</groupId>
1313
<artifactId>indexer-microservice</artifactId>
14-
<version>1.2.0-SNAPSHOT</version>
14+
<version>1.2.0</version>
1515

1616

1717
<properties>
@@ -41,7 +41,7 @@
4141
<dependency>
4242
<groupId>com.microsoft.openai.samples</groupId>
4343
<artifactId>indexer-core</artifactId>
44-
<version>1.2.0-SNAPSHOT</version>
44+
<version>1.2.0</version>
4545
</dependency>
4646
<dependency>
4747
<groupId>org.springframework.boot</groupId>

‎app/indexer/pom.xml

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

77
<groupId>com.microsoft.openai.samples</groupId>
88
<artifactId>indexer-parent</artifactId>
9-
<version>1.2.0-SNAPSHOT</version>
9+
<version>1.2.0</version>
1010
<packaging>pom</packaging>
1111

1212
<properties>
@@ -25,6 +25,7 @@
2525
<module>core</module>
2626
<module>cli</module>
2727
<module>microservice</module>
28+
<module>functions</module>
2829
</modules>
2930

3031
<dependencyManagement>

0 commit comments

Comments
 (0)