Skip to content

Commit

Permalink
Merge branch 'main' into glib-warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
mattmundell authored Sep 27, 2023
2 parents 4e101a9 + 26983e2 commit d9d5df9
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- name: Build and push
uses: docker/build-push-action@v5
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- name: Build and push Container image
uses: docker/build-push-action@v5
with:
Expand Down
2 changes: 1 addition & 1 deletion src/schema_formats/HTML/HTML.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<xsl:text>&gt;</xsl:text>
<xsl:call-template name="newline"/>
<xsl:choose>
<xsl:when test="name() = 'help_response' or name() = 'p'">
<xsl:when test="name() = 'help_response' or name() = 'p' or name() = 'icalendar'">
<!-- Special case certain responses to preserve whitespace. -->
<xsl:variable name="string" select="func:string-trim-nl(text())"/>
<xsl:if test="string-length($string) &gt; 0">
Expand Down
14 changes: 10 additions & 4 deletions src/schema_formats/XML/GMP.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -4994,11 +4994,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<summary>Create a schedule</summary>
<request>
<create_schedule>
<name>Every day</name>
<timezone>UTC</timezone>
<name>On the third Wednesday of every month</name>
<timezone>America/New_York</timezone>
<icalendar>
<truncated>...</truncated>
DTSTART;TZID=/UTC:20200603T162600
BEGIN:VCALENDAR
VERSION:2.0
PRODID:-//XXX//NONSGML//EN
BEGIN:VEVENT
DTSTART;TZID="America/New_York":20221214T000100
RRULE:FREQ=MONTHLY;BYDAY=3WE;
END:VEVENT
END:VCALENDAR
</icalendar>
</create_schedule>
</request>
Expand Down

0 comments on commit d9d5df9

Please sign in to comment.